Display an error when we come to the root.

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

diff --git a/gtk/gtkscale.h b/gtk/gtkscale.h
index bfb099ef1ba12165dafc71cf1fa3ef8fddb170a9..b249c290f9783307afa416b6ef8054f1a08c84c9 100644 (file)
--- a/gtk/gtkscale.h
+++ b/gtk/gtkscale.h
@@ -32,17 +32,14 @@
 #include <gtk/gtkrange.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #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;
@@ -61,13 +58,21 @@ struct _GtkScaleClass
 {
   GtkRangeClass parent_class;
 
-  gchar* (* format_value) (GtkRange *range,
+  gchar* (* format_value) (GtkScale *scale,
                            gdouble   value);  
   
   void (* draw_value) (GtkScale *scale);
+
+  void (* get_layout_offsets) (GtkScale *scale,
+                               gint     *x,
+                               gint     *y);
+  /* Padding for future expansion */
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
-GtkType gtk_scale_get_type        (void) G_GNUC_CONST;
+GType           gtk_scale_get_type       (void) G_GNUC_CONST;
 
 void            gtk_scale_set_digits     (GtkScale        *scale,
                                           gint             digits);
@@ -79,16 +84,19 @@ void            gtk_scale_set_value_pos  (GtkScale        *scale,
                                           GtkPositionType  pos);
 GtkPositionType gtk_scale_get_value_pos  (GtkScale        *scale);
 
+PangoLayout     *gtk_scale_get_layout        (GtkScale        *scale);
+void            gtk_scale_get_layout_offsets (GtkScale        *scale,
+                                             gint            *x,
+                                             gint            *y);
+void    _gtk_scale_clear_layout    (GtkScale        *scale);
 
 void    _gtk_scale_get_value_size  (GtkScale        *scale,
                                     gint            *width,
                                     gint            *height);
-gchar  *_gtk_scale_format_value   (GtkScale        *scale,
-                                   gdouble          value);
+gchar  *_gtk_scale_format_value    (GtkScale        *scale,
+                                    gdouble          value);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
 
+G_END_DECLS
 
 #endif /* __GTK_SCALE_H__ */