clamp the value to [lower...upper-page_size] instead of only

[~andy/gtk] / gtk / gtkruler.h

diff --git a/gtk/gtkruler.h b/gtk/gtkruler.h
index f9d4b20892e7c760c916307070be08b6b6ef9053..2ef0784903c1348a31c55690abbd6397e7668ed4 100644 (file)
--- a/gtk/gtkruler.h
+++ b/gtk/gtkruler.h
@@ -21,7 +21,7 @@
  * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
 /*
@@ -34,6 +34,10 @@
  * distribution.
  */
 
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #ifndef __GTK_RULER_H__
 #define __GTK_RULER_H__
 
@@ -42,17 +46,14 @@
 #include <gtk/gtkwidget.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_RULER            (gtk_ruler_get_type ())
-#define GTK_RULER(obj)            (GTK_CHECK_CAST ((obj), GTK_TYPE_RULER, GtkRuler))
-#define GTK_RULER_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_RULER, GtkRulerClass))
-#define GTK_IS_RULER(obj)         (GTK_CHECK_TYPE ((obj), GTK_TYPE_RULER))
-#define GTK_IS_RULER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_RULER))
-#define GTK_RULER_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_RULER, GtkRulerClass))
+#define GTK_RULER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RULER, GtkRuler))
+#define GTK_RULER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RULER, GtkRulerClass))
+#define GTK_IS_RULER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RULER))
+#define GTK_IS_RULER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_RULER))
+#define GTK_RULER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_RULER, GtkRulerClass))
 
 
 typedef struct _GtkRuler        GtkRuler;
@@ -66,20 +67,21 @@ struct _GtkRuler
 {
   GtkWidget widget;
 
-  GdkPixmap *backing_store;
-  GdkGC *non_gr_exp_gc;
-  GtkRulerMetric *metric;
-  gint xsrc, ysrc;
-  gint slider_size;
+  GdkPixmap *GSEAL (backing_store);
+  GdkGC *GSEAL (non_gr_exp_gc);                /* unused */
+  GtkRulerMetric *GSEAL (metric);
+  gint GSEAL (xsrc);
+  gint GSEAL (ysrc);
+  gint GSEAL (slider_size);
 
   /* The upper limit of the ruler (in points) */
-  gfloat lower;
+  gdouble GSEAL (lower);
   /* The lower limit of the ruler */
-  gfloat upper;
+  gdouble GSEAL (upper);
   /* The position of the mark on the ruler */
-  gfloat position;
+  gdouble GSEAL (position);
   /* The maximum size of the ruler */
-  gfloat max_size;
+  gdouble GSEAL (max_size);
 };
 
 struct _GtkRulerClass
@@ -88,6 +90,12 @@ struct _GtkRulerClass
 
   void (* draw_ticks) (GtkRuler *ruler);
   void (* draw_pos)   (GtkRuler *ruler);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 struct _GtkRulerMetric
@@ -96,27 +104,30 @@ struct _GtkRulerMetric
   gchar *abbrev;
   /* This should be points_per_unit. This is the size of the unit
    * in 1/72nd's of an inch and has nothing to do with screen pixels */
-  gfloat pixels_per_unit;
-  gfloat ruler_scale[10];
+  gdouble pixels_per_unit;
+  gdouble ruler_scale[10];
   gint subdivide[5];        /* five possible modes of subdivision */
 };
 
 
-GtkType gtk_ruler_get_type   (void) G_GNUC_CONST;
+GType   gtk_ruler_get_type   (void) G_GNUC_CONST;
 void    gtk_ruler_set_metric (GtkRuler      *ruler,
                              GtkMetricType  metric);
 void    gtk_ruler_set_range  (GtkRuler      *ruler,
-                             gfloat         lower,
-                             gfloat         upper,
-                             gfloat         position,
-                             gfloat         max_size);
+                             gdouble        lower,
+                             gdouble        upper,
+                             gdouble        position,
+                             gdouble        max_size);
 void    gtk_ruler_draw_ticks (GtkRuler      *ruler);
 void    gtk_ruler_draw_pos   (GtkRuler      *ruler);
 
+GtkMetricType gtk_ruler_get_metric (GtkRuler *ruler);
+void          gtk_ruler_get_range  (GtkRuler *ruler,
+                                   gdouble  *lower,
+                                   gdouble  *upper,
+                                   gdouble  *position,
+                                   gdouble  *max_size);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_RULER_H__ */