Simplify semantics and check for errors.

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

diff --git a/gtk/gtkstatusbar.h b/gtk/gtkstatusbar.h
index ccfc2c244ecbbaad7dec960738b38a8617575ab3..84026ca44915ae7b4f6676a2fef8ad6dd9a91ce9 100644 (file)
--- a/gtk/gtkstatusbar.h
+++ b/gtk/gtkstatusbar.h
@@ -36,16 +36,15 @@ extern "C" {
 
 
 #define GTK_TYPE_STATUSBAR            (gtk_statusbar_get_type ())
-#define GTK_STATUSBAR(obj)            (GTK_CHECK_CAST ((obj), GTK_TYPE_STATUSBAR, GtkStatusbar))
-#define GTK_STATUSBAR_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_STATUSBAR, GtkStatusbarClass))
-#define GTK_IS_STATUSBAR(obj)         (GTK_CHECK_TYPE ((obj), GTK_TYPE_STATUSBAR))
-#define GTK_IS_STATUSBAR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_STATUSBAR))
-#define GTK_STATUSBAR_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_STATUSBAR, GtkStatusbarClass))
+#define GTK_STATUSBAR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_STATUSBAR, GtkStatusbar))
+#define GTK_STATUSBAR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_STATUSBAR, GtkStatusbarClass))
+#define GTK_IS_STATUSBAR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_STATUSBAR))
+#define GTK_IS_STATUSBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_STATUSBAR))
+#define GTK_STATUSBAR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_STATUSBAR, GtkStatusbarClass))
 
 
 typedef struct _GtkStatusbar      GtkStatusbar;
 typedef struct _GtkStatusbarClass GtkStatusbarClass;
-typedef struct _GtkStatusbarMsg GtkStatusbarMsg;
 
 struct _GtkStatusbar
 {
@@ -59,6 +58,10 @@ struct _GtkStatusbar
 
   guint seq_context_id;
   guint seq_message_id;
+
+  GdkWindow *grip_window;
+  
+  guint has_resize_grip : 1;
 };
 
 struct _GtkStatusbarClass
@@ -73,16 +76,16 @@ struct _GtkStatusbarClass
   void (*text_popped)  (GtkStatusbar   *statusbar,
                         guint           context_id,
                         const gchar    *text);
-};
 
-struct _GtkStatusbarMsg
-{
-  gchar *text;
-  guint context_id;
-  guint message_id;
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
-GtkType    gtk_statusbar_get_type      (void) G_GNUC_CONST;
+
+GType      gtk_statusbar_get_type      (void) G_GNUC_CONST;
 GtkWidget* gtk_statusbar_new           (void);
 /* If you don't want to use contexts, 0 is a predefined global
  * context_id you can pass to push/pop/remove
@@ -99,7 +102,9 @@ void       gtk_statusbar_remove              (GtkStatusbar *statusbar,
                                         guint         context_id,
                                         guint         message_id);
 
-
+void     gtk_statusbar_set_has_resize_grip (GtkStatusbar *statusbar,
+                                           gboolean      setting);
+gboolean gtk_statusbar_get_has_resize_grip (GtkStatusbar *statusbar);
 
 #ifdef __cplusplus
 }