diff options
author | Tim Janik <timj@src.gnome.org> | 1998-03-09 07:36:55 +0000 |
---|---|---|
committer | Tim Janik <timj@src.gnome.org> | 1998-03-09 07:36:55 +0000 |
commit | 7b721e200bc1590bb83d7b872da5d839518d8fe3 (patch) | |
tree | 6354e6431c85e7210019e495c97a6ea1060affa4 /gtk/gtkmenu.c | |
parent | c9f7f2a0f80ad277b55f346609b4127445ae2042 (diff) | |
download | gtk+-7b721e200bc1590bb83d7b872da5d839518d8fe3.tar.gz |
hehe stupid me, wanted to fix a warning, and borke
the menus instead...
-timj
Diffstat (limited to 'gtk/gtkmenu.c')
-rw-r--r-- | gtk/gtkmenu.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index c4b8da2d79..741dbc2ced 100644 --- a/gtk/gtkmenu.c +++ b/gtk/gtkmenu.c @@ -847,14 +847,18 @@ gtk_menu_need_resize (GtkContainer *container) static void gtk_menu_deactivate (GtkMenuShell *menu_shell) { + GtkWidget *parent; + g_return_if_fail (menu_shell != NULL); g_return_if_fail (GTK_IS_MENU (menu_shell)); + parent = menu_shell->parent_menu_shell; + menu_shell->activate_time = 0; gtk_menu_popdown (GTK_MENU (menu_shell)); - if (menu_shell->parent_menu_shell) - gtk_menu_shell_deactivate (GTK_MENU_SHELL (menu_shell->parent_menu_shell)); + if (parent) + gtk_menu_shell_deactivate (GTK_MENU_SHELL (parent)); } |