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.

diff --git a/ChangeLog b/ChangeLog
index 926249eabfcf7391305401eba3212ed4d2f03a26..631f4cbf433608d887d8549033e70d48699d16a6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 926249eabfcf7391305401eba3212ed4d2f03a26..631f4cbf433608d887d8549033e70d48699d16a6 100644 (file)
--- 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 926249eabfcf7391305401eba3212ed4d2f03a26..631f4cbf433608d887d8549033e70d48699d16a6 100644 (file)
--- 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 926249eabfcf7391305401eba3212ed4d2f03a26..631f4cbf433608d887d8549033e70d48699d16a6 100644 (file)
--- 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 db2dbcbc3a2865a50fb22b8996d4f315c309641a..3038c42f7afcfc03332ddcc4398fb8646d664bd5 100644 (file)
--- 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;