diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2006-05-03 17:07:09 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2006-05-03 17:07:09 +0000 |
| commit | e272345b5d41bfe7272f72cccc7073442db49b8d (patch) | |
| tree | 9e291c6c4e43d40017560b130607f5d597e66e83 /gtk/gtkmenubar.c | |
| parent | 7f399f19f975dbf667f9df205ca1af3807c80511 (diff) | |
| download | gtk+-e272345b5d41bfe7272f72cccc7073442db49b8d.tar.gz | |
More G_DEFINE_TYPE conversion.
2006-05-03 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkaccessible.c:
* gtk/gtkclipboard.c:
* gtk/gtkfilefilter.c:
* gtk/gtkimmodule.c:
* gtk/gtkmenubar.c: More G_DEFINE_TYPE conversion.
Diffstat (limited to 'gtk/gtkmenubar.c')
| -rw-r--r-- | gtk/gtkmenubar.c | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/gtk/gtkmenubar.c b/gtk/gtkmenubar.c index 5df2c725e4..9b6e725532 100644 --- a/gtk/gtkmenubar.c +++ b/gtk/gtkmenubar.c @@ -87,22 +87,11 @@ static void gtk_menu_bar_move_current (GtkMenuShell *menu_shell, static GtkShadowType get_shadow_type (GtkMenuBar *menubar); -static GtkMenuShellClass *parent_class = NULL; +G_DEFINE_TYPE (GtkMenuBar, gtk_menu_bar, GTK_TYPE_MENU_SHELL); -GType -gtk_menu_bar_get_type (void) +static void +gtk_menu_bar_init (GtkMenuBar *object) { - static GType menu_bar_type = 0; - - if (!menu_bar_type) - menu_bar_type = g_type_register_static_simple (GTK_TYPE_MENU_SHELL, - I_("GtkMenuBar"), - sizeof (GtkMenuBarClass), - gtk_menu_bar_class_init, - sizeof (GtkMenuBar), - NULL, 0); - - return menu_bar_type; } static void @@ -114,8 +103,6 @@ gtk_menu_bar_class_init (GtkMenuBarClass *class) GtkBindingSet *binding_set; - parent_class = g_type_class_peek_parent (class); - gobject_class = (GObjectClass*) class; widget_class = (GtkWidgetClass*) class; menu_shell_class = (GtkMenuShellClass*) class; @@ -551,7 +538,7 @@ gtk_menu_bar_expose (GtkWidget *widget, { gtk_menu_bar_paint (widget, &event->area); - (* GTK_WIDGET_CLASS (parent_class)->expose_event) (widget, event); + (* GTK_WIDGET_CLASS (gtk_menu_bar_parent_class)->expose_event) (widget, event); } return FALSE; @@ -839,7 +826,7 @@ gtk_menu_bar_move_current (GtkMenuShell *menu_shell, } } - GTK_MENU_SHELL_CLASS (parent_class)->move_current (menu_shell, direction); + GTK_MENU_SHELL_CLASS (gtk_menu_bar_parent_class)->move_current (menu_shell, direction); } /** |