diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 4 | ||||
| -rw-r--r-- | gtk/gtkmenuitem.c | 4 |
5 files changed, 19 insertions, 1 deletions
@@ -1,5 +1,9 @@ 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. + * gtk/gtktearoffmenuitem.c (tearoff_state_changed): Fix the signature to avoid overwriting a pspec. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 926249eabf..631f4cbf43 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,9 @@ 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. + * gtk/gtktearoffmenuitem.c (tearoff_state_changed): Fix the signature to avoid overwriting a pspec. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 926249eabf..631f4cbf43 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,9 @@ 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. + * gtk/gtktearoffmenuitem.c (tearoff_state_changed): Fix the signature to avoid overwriting a pspec. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 926249eabf..631f4cbf43 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,9 @@ 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. + * gtk/gtktearoffmenuitem.c (tearoff_state_changed): Fix the signature to avoid overwriting a pspec. 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; |