diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2013-06-27 20:02:52 +0100 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2013-07-09 09:30:02 +0100 |
| commit | 0899ef7cc9cf73824901923143f38bb9b6d224a3 (patch) | |
| tree | 16207a8837da8a89a6f4a1d1a1c23074fd29aa1d /gtk/gtkbutton.c | |
| parent | 365919d5f6da0a8648815ca5cf5805fb88c9be16 (diff) | |
| download | gtk+-0899ef7cc9cf73824901923143f38bb9b6d224a3.tar.gz | |
gtk: Use new macros for defining private data
https://bugzilla.gnome.org/show_bug.cgi?id=702996
Diffstat (limited to 'gtk/gtkbutton.c')
| -rw-r--r-- | gtk/gtkbutton.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c index 268a2ccb4a..26ce7039b3 100644 --- a/gtk/gtkbutton.c +++ b/gtk/gtkbutton.c @@ -190,6 +190,7 @@ static guint button_signals[LAST_SIGNAL] = { 0 }; G_GNUC_BEGIN_IGNORE_DEPRECATIONS; G_DEFINE_TYPE_WITH_CODE (GtkButton, gtk_button, GTK_TYPE_BIN, + G_ADD_PRIVATE (GtkButton) G_IMPLEMENT_INTERFACE (GTK_TYPE_ACTIONABLE, gtk_button_actionable_iface_init) G_IMPLEMENT_INTERFACE (GTK_TYPE_ACTIVATABLE, gtk_button_activatable_interface_init)) @@ -584,8 +585,6 @@ gtk_button_class_init (GtkButtonClass *klass) 2, GTK_PARAM_READABLE)); - g_type_class_add_private (gobject_class, sizeof (GtkButtonPrivate)); - gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_BUTTON_ACCESSIBLE); } @@ -595,9 +594,7 @@ gtk_button_init (GtkButton *button) GtkButtonPrivate *priv; GtkStyleContext *context; - button->priv = G_TYPE_INSTANCE_GET_PRIVATE (button, - GTK_TYPE_BUTTON, - GtkButtonPrivate); + button->priv = gtk_button_get_instance_private (button); priv = button->priv; gtk_widget_set_can_focus (GTK_WIDGET (button), TRUE); |