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/gtkmenutoolbutton.c | |
| parent | 33cddd12d78abb2efe6facba9c859017f8df9819 (diff) | |
| download | gtk+-f26aad1916445d25c99878138dfc384de67a2060.tar.gz | |
Boilerplate reduction
Diffstat (limited to 'gtk/gtkmenutoolbutton.c')
| -rw-r--r-- | gtk/gtkmenutoolbutton.c | 40 |
1 files changed, 4 insertions, 36 deletions
diff --git a/gtk/gtkmenutoolbutton.c b/gtk/gtkmenutoolbutton.c index e0d845d8a2..db7b3eb4c4 100644 --- a/gtk/gtkmenutoolbutton.c +++ b/gtk/gtkmenutoolbutton.c @@ -43,8 +43,6 @@ struct _GtkMenuToolButtonPrivate GtkMenu *menu; }; -static void gtk_menu_tool_button_init (GtkMenuToolButton *button); -static void gtk_menu_tool_button_class_init (GtkMenuToolButtonClass *klass); static void gtk_menu_tool_button_destroy (GtkObject *object); static int menu_deactivate_cb (GtkMenuShell *menu_shell, @@ -65,35 +63,7 @@ enum static gint signals[LAST_SIGNAL]; -static GObjectClass *parent_class = NULL; - -GType -gtk_menu_tool_button_get_type (void) -{ - static GType type = 0; - - if (type == 0) - { - static const GTypeInfo info = - { - sizeof (GtkMenuToolButtonClass), - (GBaseInitFunc) 0, - (GBaseFinalizeFunc) 0, - (GClassInitFunc) gtk_menu_tool_button_class_init, - (GClassFinalizeFunc) 0, - NULL, - sizeof (GtkMenuToolButton), - 0, /* n_preallocs */ - (GInstanceInitFunc) gtk_menu_tool_button_init - }; - - type = g_type_register_static (GTK_TYPE_TOOL_BUTTON, - I_("GtkMenuToolButton"), - &info, 0); - } - - return type; -} +G_DEFINE_TYPE (GtkMenuToolButton, gtk_menu_tool_button, GTK_TYPE_TOOL_BUTTON); static gboolean gtk_menu_tool_button_set_tooltip (GtkToolItem *tool_item, @@ -175,7 +145,7 @@ gtk_menu_tool_button_toolbar_reconfigured (GtkToolItem *toolitem) gtk_menu_tool_button_construct_contents (GTK_MENU_TOOL_BUTTON (toolitem)); /* chain up */ - GTK_TOOL_ITEM_CLASS (parent_class)->toolbar_reconfigured (toolitem); + GTK_TOOL_ITEM_CLASS (gtk_menu_tool_button_parent_class)->toolbar_reconfigured (toolitem); } static void @@ -239,8 +209,6 @@ gtk_menu_tool_button_class_init (GtkMenuToolButtonClass *klass) GtkWidgetClass *widget_class; GtkToolItemClass *toolitem_class; - parent_class = g_type_class_peek_parent (klass); - object_class = (GObjectClass *)klass; gtk_object_class = (GtkObjectClass *)klass; widget_class = (GtkWidgetClass *)klass; @@ -460,8 +428,8 @@ gtk_menu_tool_button_destroy (GtkObject *object) button); } - if (GTK_OBJECT_CLASS (parent_class)->destroy) - (*GTK_OBJECT_CLASS (parent_class)->destroy) (object); + if (GTK_OBJECT_CLASS (gtk_menu_tool_button_parent_class)->destroy) + (*GTK_OBJECT_CLASS (gtk_menu_tool_button_parent_class)->destroy) (object); } /** |