The render vfunc takes a GdkDrawable* instead of a GdkWindow*, because

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

diff --git a/gtk/gtkprogressbar.h b/gtk/gtkprogressbar.h
index b4252960e3ef97b17220cbe03cc6f37c2d4f820d..c113ae1923306ada6e2fb93127982af4cbd8f9c5 100644 (file)
--- a/gtk/gtkprogressbar.h
+++ b/gtk/gtkprogressbar.h
@@ -38,11 +38,11 @@ extern "C" {
 
 
 #define GTK_TYPE_PROGRESS_BAR            (gtk_progress_bar_get_type ())
-#define GTK_PROGRESS_BAR(obj)            (GTK_CHECK_CAST ((obj), GTK_TYPE_PROGRESS_BAR, GtkProgressBar))
-#define GTK_PROGRESS_BAR_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_PROGRESS_BAR, GtkProgressBarClass))
-#define GTK_IS_PROGRESS_BAR(obj)         (GTK_CHECK_TYPE ((obj), GTK_TYPE_PROGRESS_BAR))
-#define GTK_IS_PROGRESS_BAR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PROGRESS_BAR))
-#define GTK_PROGRESS_BAR_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_PROGRESS_BAR, GtkProgressBarClass))
+#define GTK_PROGRESS_BAR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PROGRESS_BAR, GtkProgressBar))
+#define GTK_PROGRESS_BAR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_PROGRESS_BAR, GtkProgressBarClass))
+#define GTK_IS_PROGRESS_BAR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PROGRESS_BAR))
+#define GTK_IS_PROGRESS_BAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PROGRESS_BAR))
+#define GTK_PROGRESS_BAR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PROGRESS_BAR, GtkProgressBarClass))
 
 
 typedef struct _GtkProgressBar       GtkProgressBar;
@@ -76,7 +76,7 @@ struct _GtkProgressBar
   guint activity_step;
   guint activity_blocks;
 
-  gfloat pulse_fraction;
+  gdouble pulse_fraction;
   
   guint activity_dir : 1;
 };
@@ -84,10 +84,16 @@ struct _GtkProgressBar
 struct _GtkProgressBarClass
 {
   GtkProgressClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 
-GtkType    gtk_progress_bar_get_type             (void) G_GNUC_CONST;
+GType      gtk_progress_bar_get_type             (void) G_GNUC_CONST;
 GtkWidget* gtk_progress_bar_new                  (void);
 
 /*
@@ -121,16 +127,16 @@ void       gtk_progress_bar_pulse                (GtkProgressBar *pbar);
 void       gtk_progress_bar_set_text             (GtkProgressBar *pbar,
                                                   const gchar    *text);
 void       gtk_progress_bar_set_fraction         (GtkProgressBar *pbar,
-                                                  gfloat          fraction);
+                                                  gdouble         fraction);
 
 void       gtk_progress_bar_set_pulse_step       (GtkProgressBar *pbar,
-                                                  gfloat          fraction);
+                                                  gdouble         fraction);
 void       gtk_progress_bar_set_orientation      (GtkProgressBar *pbar,
                                                  GtkProgressBarOrientation orientation);
 
-gchar* gtk_progress_bar_get_text       (GtkProgressBar *pbar);
-gfloat gtk_progress_bar_get_fraction   (GtkProgressBar *pbar);
-gfloat gtk_progress_bar_get_pulse_step (GtkProgressBar *pbar);
+G_CONST_RETURN gchar* gtk_progress_bar_get_text       (GtkProgressBar *pbar);
+gdouble               gtk_progress_bar_get_fraction   (GtkProgressBar *pbar);
+gdouble               gtk_progress_bar_get_pulse_step (GtkProgressBar *pbar);
 
 GtkProgressBarOrientation gtk_progress_bar_get_orientation (GtkProgressBar *pbar);
 
@@ -152,7 +158,7 @@ void       gtk_progress_bar_set_activity_step    (GtkProgressBar *pbar,
 void       gtk_progress_bar_set_activity_blocks  (GtkProgressBar *pbar,
                                                  guint           blocks);
 void       gtk_progress_bar_update               (GtkProgressBar *pbar,
-                                                 gfloat          percentage);
+                                                 gdouble         percentage);
 
 #endif /* GTK_DISABLE_DEPRECATED */