callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reintroduce the reverted change, since it is necessary to prevent lost

Browse Source 
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:
Matthias Clasen
2004-12-13 20:04:40 +00:00
committed by Matthias Clasen
parent 7d9dfbd20e
commit fade865f80
5 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2004-12-13 Matthias Clasen <mclasen@redhat.com> 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 * gtk/gtktearoffmenuitem.c (tearoff_state_changed): Fix the signature
to avoid overwriting a pspec. to avoid overwriting a pspec.

4
ChangeLog.pre-2-10
View File

@ -1,5 +1,9 @@
2004-12-13 Matthias Clasen <mclasen@redhat.com> 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 * gtk/gtktearoffmenuitem.c (tearoff_state_changed): Fix the signature
to avoid overwriting a pspec. to avoid overwriting a pspec.

4
ChangeLog.pre-2-6
View File

@ -1,5 +1,9 @@
2004-12-13 Matthias Clasen <mclasen@redhat.com> 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 * gtk/gtktearoffmenuitem.c (tearoff_state_changed): Fix the signature
to avoid overwriting a pspec. to avoid overwriting a pspec.

4
ChangeLog.pre-2-8
View File

@ -1,5 +1,9 @@
2004-12-13 Matthias Clasen <mclasen@redhat.com> 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 * gtk/gtktearoffmenuitem.c (tearoff_state_changed): Fix the signature
to avoid overwriting a pspec. to avoid overwriting a pspec.

4
gtk/gtkmenuitem.c
View File

@ -838,7 +838,9 @@ gtk_real_menu_item_select (GtkItem *item)
menu_item = GTK_MENU_ITEM (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; gint popup_delay;