forked from AuroraMiddleware/gtk
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.
This commit is contained in:
parent
7d9dfbd20e
commit
fade865f80
@ -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.
|
||||
|
||||
|
@ -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.
|
||||
|
||||
|
@ -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.
|
||||
|
||||
|
@ -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.
|
||||
|
||||
|
@ -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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user