diff options
| author | Matthias Clasen <matthiasc@src.gnome.org> | 2006-05-02 23:56:43 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2006-05-02 23:56:43 +0000 |
| commit | f26aad1916445d25c99878138dfc384de67a2060 (patch) | |
| tree | b72263ecb326e82a49f1e8d1871ec4288b8aa299 /gtk/gtkmenushell.c | |
| parent | 33cddd12d78abb2efe6facba9c859017f8df9819 (diff) | |
| download | gtk+-f26aad1916445d25c99878138dfc384de67a2060.tar.gz | |
Boilerplate reduction
Diffstat (limited to 'gtk/gtkmenushell.c')
| -rw-r--r-- | gtk/gtkmenushell.c | 37 |
1 files changed, 2 insertions, 35 deletions
diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c index bce558672a..4d5d837aa5 100644 --- a/gtk/gtkmenushell.c +++ b/gtk/gtkmenushell.c @@ -142,8 +142,6 @@ struct _GtkMenuShellPrivate gboolean take_focus; }; -static void gtk_menu_shell_class_init (GtkMenuShellClass *klass); -static void gtk_menu_shell_init (GtkMenuShell *menu_shell); static void gtk_menu_shell_set_property (GObject *object, guint prop_id, const GValue *value, @@ -201,38 +199,9 @@ static void gtk_menu_shell_reset_key_hash (GtkMenuShell *menu_shell); static gboolean gtk_menu_shell_activate_mnemonic (GtkMenuShell *menu_shell, GdkEventKey *event); -static GtkContainerClass *parent_class = NULL; static guint menu_shell_signals[LAST_SIGNAL] = { 0 }; - -GType -gtk_menu_shell_get_type (void) -{ - static GType menu_shell_type = 0; - - if (!menu_shell_type) - { - static const GTypeInfo menu_shell_info = - { - sizeof (GtkMenuShellClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) gtk_menu_shell_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (GtkMenuShell), - 0, /* n_preallocs */ - (GInstanceInitFunc) gtk_menu_shell_init, - NULL, /* value_table */ - }; - - menu_shell_type = - g_type_register_static (GTK_TYPE_CONTAINER, I_("GtkMenuShell"), - &menu_shell_info, G_TYPE_FLAG_ABSTRACT); - } - - return menu_shell_type; -} +G_DEFINE_TYPE (GtkMenuShell, gtk_menu_shell, GTK_TYPE_CONTAINER); static void gtk_menu_shell_class_init (GtkMenuShellClass *klass) @@ -247,8 +216,6 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass) widget_class = (GtkWidgetClass*) klass; container_class = (GtkContainerClass*) klass; - parent_class = g_type_class_peek_parent (klass); - object_class->set_property = gtk_menu_shell_set_property; object_class->get_property = gtk_menu_shell_get_property; object_class->finalize = gtk_menu_shell_finalize; @@ -456,7 +423,7 @@ gtk_menu_shell_finalize (GObject *object) if (priv->key_hash) _gtk_key_hash_free (priv->key_hash); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gtk_menu_shell_parent_class)->finalize (object); } |