diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2004-12-13 20:04:40 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2004-12-13 20:04:40 +0000 |
| commit | fade865f80bc9f6389566b7b6f84feef6dd8617d (patch) | |
| tree | 94e0c53095135196b37dd61490a234659cc7f0e5 /gtk/gtkmenuitem.c | |
| parent | 7d9dfbd20e912f1596b041e71b2208a1ddfc35fa (diff) | |
| download | gtk+-fade865f80bc9f6389566b7b6f84feef6dd8617d.tar.gz | |
Reintroduce the reverted change, since it is necessary to prevent lost
2004-12-13 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkmenuitem.c (gtk_real_menu_item_select): Reintroduce
the reverted change, since it is necessary to prevent lost
submenus. But make it work for torn-off menus as well.
Diffstat (limited to 'gtk/gtkmenuitem.c')
| -rw-r--r-- | gtk/gtkmenuitem.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c index db2dbcbc3a..3038c42f7a 100644 --- a/gtk/gtkmenuitem.c +++ b/gtk/gtkmenuitem.c @@ -838,7 +838,9 @@ gtk_real_menu_item_select (GtkItem *item) menu_item = GTK_MENU_ITEM (item); - if (menu_item->submenu) + if (menu_item->submenu && + (!GTK_WIDGET_MAPPED (menu_item->submenu) || + GTK_MENU (menu_item->submenu)->tearoff_active)) { gint popup_delay; |