Commit fade865f authored by Matthias Clasen's avatar Matthias Clasen Committed by Matthias Clasen

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.
parent 7d9dfbd2
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.
......
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.
......
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.
......
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.
......
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment