diff options
| author | Tim Janik <timj@gimp.org> | 1998-03-07 23:20:56 +0000 |
|---|---|---|
| committer | Tim Janik <timj@src.gnome.org> | 1998-03-07 23:20:56 +0000 |
| commit | de1262dcc1693e42e47c5fe6d84e570cdc831552 (patch) | |
| tree | 84ddf985db91e88644bd4f2cb3adf42f9182f2ce /gtk/gtkmenu.c | |
| parent | 124d1e5caae190e620307a69f92bd5b93664bf75 (diff) | |
| download | gdk-pixbuf-de1262dcc1693e42e47c5fe6d84e570cdc831552.tar.gz | |
register living objects in a hashtable.
Sun Mar 8 00:18:04 1998 Tim Janik <timj@gimp.org>
* gtk/gtkobject.c: register living objects in a hashtable.
Diffstat (limited to 'gtk/gtkmenu.c')
| -rw-r--r-- | gtk/gtkmenu.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index 9cbd961a0..c4b8da2d7 100644 --- a/gtk/gtkmenu.c +++ b/gtk/gtkmenu.c @@ -847,18 +847,14 @@ gtk_menu_need_resize (GtkContainer *container) static void gtk_menu_deactivate (GtkMenuShell *menu_shell) { - GtkMenuShell *parent; - g_return_if_fail (menu_shell != NULL); g_return_if_fail (GTK_IS_MENU (menu_shell)); - parent = GTK_MENU_SHELL (menu_shell->parent_menu_shell); - menu_shell->activate_time = 0; gtk_menu_popdown (GTK_MENU (menu_shell)); - if (parent) - gtk_menu_shell_deactivate (parent); + if (menu_shell->parent_menu_shell) + gtk_menu_shell_deactivate (GTK_MENU_SHELL (menu_shell->parent_menu_shell)); } |