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/gtkmenushell.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/gtkmenushell.c')
| -rw-r--r-- | gtk/gtkmenushell.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c index 01366b7a6b..dd5ef2f770 100644 --- a/gtk/gtkmenushell.c +++ b/gtk/gtkmenushell.c @@ -207,7 +207,7 @@ static gboolean gtk_menu_shell_real_move_selected (GtkMenuShell *menu_shell, static guint menu_shell_signals[LAST_SIGNAL] = { 0 }; -G_DEFINE_ABSTRACT_TYPE (GtkMenuShell, gtk_menu_shell, GTK_TYPE_CONTAINER) +G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GtkMenuShell, gtk_menu_shell, GTK_TYPE_CONTAINER) static void gtk_menu_shell_class_init (GtkMenuShellClass *klass) @@ -455,8 +455,6 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass) GTK_PARAM_READWRITE)); gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_MENU_SHELL_ACCESSIBLE); - - g_type_class_add_private (object_class, sizeof (GtkMenuShellPrivate)); } static GType @@ -468,13 +466,8 @@ gtk_menu_shell_child_type (GtkContainer *container) static void gtk_menu_shell_init (GtkMenuShell *menu_shell) { - GtkMenuShellPrivate *priv; - - priv = G_TYPE_INSTANCE_GET_PRIVATE (menu_shell, - GTK_TYPE_MENU_SHELL, - GtkMenuShellPrivate); - menu_shell->priv = priv; - priv->take_focus = TRUE; + menu_shell->priv = gtk_menu_shell_get_instance_private (menu_shell); + menu_shell->priv->take_focus = TRUE; } static void |