Fix some missing initializations of rc_file->directory.

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

diff --git a/gtk/gtkscale.h b/gtk/gtkscale.h
index fd9e97446d647525b8367c12325dfbe408ef9d2c..82f3fea0cb6a8849af0d4b738e8ac34df2dfa504 100644 (file)
--- a/gtk/gtkscale.h
+++ b/gtk/gtkscale.h
@@ -38,11 +38,11 @@ extern "C" {
 
 
 #define GTK_TYPE_SCALE            (gtk_scale_get_type ())
-#define GTK_SCALE(obj)            (GTK_CHECK_CAST ((obj), GTK_TYPE_SCALE, GtkScale))
-#define GTK_SCALE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_SCALE, GtkScaleClass))
-#define GTK_IS_SCALE(obj)         (GTK_CHECK_TYPE ((obj), GTK_TYPE_SCALE))
-#define GTK_IS_SCALE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SCALE))
-#define GTK_SCALE_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_SCALE, GtkScaleClass))
+#define GTK_SCALE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SCALE, GtkScale))
+#define GTK_SCALE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SCALE, GtkScaleClass))
+#define GTK_IS_SCALE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SCALE))
+#define GTK_IS_SCALE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SCALE))
+#define GTK_SCALE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SCALE, GtkScaleClass))
 
 
 typedef struct _GtkScale        GtkScale;
@@ -52,6 +52,7 @@ struct _GtkScale
 {
   GtkRange range;
 
+  gint digits;
   guint draw_value : 1;
   guint value_pos : 2;
 };
@@ -60,24 +61,36 @@ struct _GtkScaleClass
 {
   GtkRangeClass parent_class;
 
-  gint value_spacing;
+  gchar* (* format_value) (GtkScale *scale,
+                           gdouble   value);  
   
   void (* draw_value) (GtkScale *scale);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
-GtkType gtk_scale_get_type        (void) G_GNUC_CONST;
-void    gtk_scale_set_digits      (GtkScale        *scale,
-                                  gint             digits);
-void    gtk_scale_set_draw_value  (GtkScale        *scale,
-                                  gboolean         draw_value);
-void    gtk_scale_set_value_pos   (GtkScale        *scale,
-                                  GtkPositionType  pos);
-gint    gtk_scale_get_value_width (GtkScale        *scale);
-void    gtk_scale_get_value_size  (GtkScale        *scale,
-                                  gint            *width,
-                                  gint            *height);
-
-void    gtk_scale_draw_value      (GtkScale        *scale);
+GType           gtk_scale_get_type       (void) G_GNUC_CONST;
+
+void            gtk_scale_set_digits     (GtkScale        *scale,
+                                          gint             digits);
+gint            gtk_scale_get_digits     (GtkScale        *scale);
+void            gtk_scale_set_draw_value (GtkScale        *scale,
+                                          gboolean         draw_value);
+gboolean        gtk_scale_get_draw_value (GtkScale        *scale);
+void            gtk_scale_set_value_pos  (GtkScale        *scale,
+                                          GtkPositionType  pos);
+GtkPositionType gtk_scale_get_value_pos  (GtkScale        *scale);
+
+
+void    _gtk_scale_get_value_size  (GtkScale        *scale,
+                                    gint            *width,
+                                    gint            *height);
+gchar  *_gtk_scale_format_value   (GtkScale        *scale,
+                                   gdouble          value);
 
 #ifdef __cplusplus
 }