]> Pileus Git - ~andy/gtk/commitdiff
GtkToggleToolButton: unseal private pointer
authorJavier Jardón <jjardon@gnome.org>
Wed, 14 Jul 2010 00:13:29 +0000 (02:13 +0200)
committerJavier Jardón <jjardon@gnome.org>
Wed, 14 Jul 2010 00:24:58 +0000 (02:24 +0200)
gtk/gtktoggletoolbutton.c
gtk/gtktoggletoolbutton.h
gtk/gtktoolbutton.c

index a65fdec52b90a3901b5f0bd679f67d448bd02f04..c632b7b368bb126d574c3e714793cf9d1eff7704 100644 (file)
@@ -45,8 +45,6 @@ enum {
 };
 
 
-#define GTK_TOGGLE_TOOL_BUTTON_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_TOGGLE_TOOL_BUTTON, GtkToggleToolButtonPrivate))
-
 struct _GtkToggleToolButtonPrivate
 {
   guint active : 1;
@@ -140,7 +138,9 @@ gtk_toggle_tool_button_init (GtkToggleToolButton *button)
   GtkToolButton *tool_button = GTK_TOOL_BUTTON (button);
   GtkToggleButton *toggle_button = GTK_TOGGLE_BUTTON (_gtk_tool_button_get_button (tool_button));
 
-  button->priv = GTK_TOGGLE_TOOL_BUTTON_GET_PRIVATE (button);
+  button->priv = G_TYPE_INSTANCE_GET_PRIVATE (button,
+                                              GTK_TYPE_TOGGLE_TOOL_BUTTON,
+                                              GtkToggleToolButtonPrivate);
 
   /* If the real button is a radio button, it may have been
    * active at the time it was created.
index 90314327c9937877133114877c9df831bd345bc7..c808cae451208126ac8c72ed9309ce1e51d2ffc4 100644 (file)
@@ -47,7 +47,7 @@ struct _GtkToggleToolButton
   GtkToolButton parent;
 
   /*< private >*/
-  GtkToggleToolButtonPrivate *GSEAL (priv);
+  GtkToggleToolButtonPrivate *priv;
 };
 
 struct _GtkToggleToolButtonClass
index 7f17084f2a14cb16cf22cf601a778c525df2bb78..1ac5a220bf4b0236b1067960ac5decbb9f94b634 100644 (file)
@@ -292,7 +292,7 @@ gtk_tool_button_init (GtkToolButton      *button,
 
   button->priv = G_TYPE_INSTANCE_GET_PRIVATE (button,
                                               GTK_TYPE_TOOL_BUTTON,
-                                              GtkToolButtonPriv);
+                                              GtkToolButtonPrivate);
 
   button->priv->contents_invalid = TRUE;