Fix some cases where signal connection IDs where being assigned to guint

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

diff --git a/gtk/gtktogglebutton.h b/gtk/gtktogglebutton.h
index c00b98bad5ade38414e2162c79498125c1ef76b3..dcf5d8df330a1ca658240b0d0801fce6b8d032ec 100644 (file)
--- a/gtk/gtktogglebutton.h
+++ b/gtk/gtktogglebutton.h
@@ -55,8 +55,6 @@ struct _GtkToggleButton
   guint active : 1;
   guint draw_indicator : 1;
   guint inconsistent : 1;
-  
-  GdkWindow *event_window;
 };
 
 struct _GtkToggleButtonClass
@@ -64,22 +62,35 @@ struct _GtkToggleButtonClass
   GtkButtonClass parent_class;
 
   void (* toggled) (GtkToggleButton *toggle_button);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 
-GtkType    gtk_toggle_button_get_type       (void) G_GNUC_CONST;
-GtkWidget* gtk_toggle_button_new            (void);
-GtkWidget* gtk_toggle_button_new_with_label (const gchar     *label);
-void       gtk_toggle_button_set_mode       (GtkToggleButton *toggle_button,
-                                            gboolean         draw_indicator);
-void       gtk_toggle_button_set_active     (GtkToggleButton *toggle_button,
-                                            gboolean         is_active);
-gboolean   gtk_toggle_button_get_active            (GtkToggleButton *toggle_button);
-void       gtk_toggle_button_toggled        (GtkToggleButton *toggle_button);
+GtkType    gtk_toggle_button_get_type          (void) G_GNUC_CONST;
+
+GtkWidget* gtk_toggle_button_new               (void);
+GtkWidget* gtk_toggle_button_new_with_label    (const gchar     *label);
+GtkWidget* gtk_toggle_button_new_with_mnemonic (const gchar     *label);
+void       gtk_toggle_button_set_mode          (GtkToggleButton *toggle_button,
+                                                gboolean         draw_indicator);
+gboolean   gtk_toggle_button_get_mode          (GtkToggleButton *toggle_button);
+void       gtk_toggle_button_set_active        (GtkToggleButton *toggle_button,
+                                                gboolean         is_active);
+gboolean   gtk_toggle_button_get_active        (GtkToggleButton *toggle_button);
+void       gtk_toggle_button_toggled           (GtkToggleButton *toggle_button);
+void       gtk_toggle_button_set_inconsistent  (GtkToggleButton *toggle_button,
+                                                gboolean         setting);
+gboolean   gtk_toggle_button_get_inconsistent  (GtkToggleButton *toggle_button);
+
 
-void       gtk_toggle_button_set_inconsistent (GtkToggleButton *toggle_button,
-                                               gboolean         setting);
-gboolean   gtk_toggle_button_get_inconsistent (GtkToggleButton *toggle_button);
+#ifndef GTK_DISABLE_DEPRECATED
+#define        gtk_toggle_button_set_state             gtk_toggle_button_set_active
+#endif /* GTK_DISABLE_DEPRECATED */
 
 #ifdef __cplusplus
 }