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/gtkmenu.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/gtkmenu.c')
| -rw-r--r-- | gtk/gtkmenu.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index feed5e30e9..ece083dcab 100644 --- a/gtk/gtkmenu.c +++ b/gtk/gtkmenu.c @@ -310,7 +310,7 @@ static const gchar attach_data_key[] = "gtk-menu-attach-data"; static guint menu_signals[LAST_SIGNAL] = { 0 }; -G_DEFINE_TYPE (GtkMenu, gtk_menu, GTK_TYPE_MENU_SHELL) +G_DEFINE_TYPE_WITH_PRIVATE (GtkMenu, gtk_menu, GTK_TYPE_MENU_SHELL) static void menu_queue_resize (GtkMenu *menu) @@ -871,8 +871,6 @@ gtk_menu_class_init (GtkMenuClass *class) GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_DOWN); - g_type_class_add_private (gobject_class, sizeof (GtkMenuPrivate)); - gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_MENU_ACCESSIBLE); } @@ -1071,7 +1069,7 @@ gtk_menu_init (GtkMenu *menu) GtkMenuPrivate *priv; GtkStyleContext *context; - priv = G_TYPE_INSTANCE_GET_PRIVATE (menu, GTK_TYPE_MENU, GtkMenuPrivate); + priv = gtk_menu_get_instance_private (menu); menu->priv = priv; |