Commit 0a41106a authored by Matthias Clasen's avatar Matthias Clasen Committed by Matthias Clasen

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)
parent ebfab369
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)
2004-05-06 Sven Neumann <sven@gimp.org>
* gtk/gtkexpander.c (gtk_expander_size_allocate): in RTL mode,
......
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)
2004-05-06 Sven Neumann <sven@gimp.org>
* gtk/gtkexpander.c (gtk_expander_size_allocate): in RTL mode,
......
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)
2004-05-06 Sven Neumann <sven@gimp.org>
* gtk/gtkexpander.c (gtk_expander_size_allocate): in RTL mode,
......
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)
2004-05-06 Sven Neumann <sven@gimp.org>
* gtk/gtkexpander.c (gtk_expander_size_allocate): in RTL mode,
......
......@@ -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)
......
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