diff options
-rw-r--r-- | gtk/gtktoggletoolbutton.c | 6 | ||||
-rw-r--r-- | gtk/gtktoggletoolbutton.h | 2 | ||||
-rw-r--r-- | gtk/gtktoolbutton.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/gtk/gtktoggletoolbutton.c b/gtk/gtktoggletoolbutton.c index a65fdec52b..c632b7b368 100644 --- a/gtk/gtktoggletoolbutton.c +++ b/gtk/gtktoggletoolbutton.c @@ -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. diff --git a/gtk/gtktoggletoolbutton.h b/gtk/gtktoggletoolbutton.h index 90314327c9..c808cae451 100644 --- a/gtk/gtktoggletoolbutton.h +++ b/gtk/gtktoggletoolbutton.h @@ -47,7 +47,7 @@ struct _GtkToggleToolButton GtkToolButton parent; /*< private >*/ - GtkToggleToolButtonPrivate *GSEAL (priv); + GtkToggleToolButtonPrivate *priv; }; struct _GtkToggleToolButtonClass diff --git a/gtk/gtktoolbutton.c b/gtk/gtktoolbutton.c index 7f17084f2a..1ac5a220bf 100644 --- a/gtk/gtktoolbutton.c +++ b/gtk/gtktoolbutton.c @@ -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; |