diff options
| author | Matthias Clasen <maclas@gmx.de> | 2004-05-07 03:55:39 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2004-05-07 03:55:39 +0000 |
| commit | 0a41106ac246d5e33950be4d26ddcaee0ba4352e (patch) | |
| tree | 75147fcdfdf3c0e77ddeaae9ebcdf3436d77baed /gtk/gtkmenuitem.c | |
| parent | ebfab36967b356c0be61874f3a176988c99d90dd (diff) | |
| download | gtk+-0a41106ac246d5e33950be4d26ddcaee0ba4352e.tar.gz | |
Merge from 2.4:
Thu May 6 23:52:13 2004 Matthias Clasen <maclas@gmx.de>
Merge from 2.4:
* gtk/gtkmenuitem.c (gtk_menu_item_select_timeout): Also
popup the submenu for items in torn off menus. (#122051)
Diffstat (limited to 'gtk/gtkmenuitem.c')
| -rw-r--r-- | gtk/gtkmenuitem.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c index 9e1a62c675..039a6c5ef9 100644 --- a/gtk/gtkmenuitem.c +++ b/gtk/gtkmenuitem.c @@ -962,7 +962,8 @@ gtk_menu_item_select_timeout (gpointer data) parent = GTK_WIDGET (menu_item)->parent; - if (parent && GTK_IS_MENU_SHELL (parent) && GTK_MENU_SHELL (parent)->active) + if ((GTK_IS_MENU_SHELL (parent) && GTK_MENU_SHELL (parent)->active) || + (GTK_IS_MENU (parent) && GTK_MENU (parent)->torn_off)) { gtk_menu_item_popup_submenu (data); if (menu_item->timer_from_keypress && menu_item->submenu) |