Fix test for "active submenu".

Fri Mar 15 13:31:51 2002  Soeren Sandmann  <sandmann@daimi.au.dk>

	* gtk/gtkmenu.c (gtk_menu_leave_notify): Fix test for "active
	submenu".

diff --git a/ChangeLog b/ChangeLog
index b84b2e192ffe065edf28a541a115e6c046afd261..f4fbf605130e3be4b8557aea7790aea6af522d23 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Mar 15 13:31:51 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtkmenu.c (gtk_menu_leave_notify): Fix test for "active
+       submenu".
+
 2002-03-15 Padraig O'Briain <padraig.obriain@sun.com>
 
        * gdk/x11/gdkkeys-x11.c (update_keymaps): Fudge keymap to have lower

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index b84b2e192ffe065edf28a541a115e6c046afd261..f4fbf605130e3be4b8557aea7790aea6af522d23 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Fri Mar 15 13:31:51 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtkmenu.c (gtk_menu_leave_notify): Fix test for "active
+       submenu".
+
 2002-03-15 Padraig O'Briain <padraig.obriain@sun.com>
 
        * gdk/x11/gdkkeys-x11.c (update_keymaps): Fudge keymap to have lower

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b84b2e192ffe065edf28a541a115e6c046afd261..f4fbf605130e3be4b8557aea7790aea6af522d23 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Fri Mar 15 13:31:51 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtkmenu.c (gtk_menu_leave_notify): Fix test for "active
+       submenu".
+
 2002-03-15 Padraig O'Briain <padraig.obriain@sun.com>
 
        * gdk/x11/gdkkeys-x11.c (update_keymaps): Fudge keymap to have lower

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index b84b2e192ffe065edf28a541a115e6c046afd261..f4fbf605130e3be4b8557aea7790aea6af522d23 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Fri Mar 15 13:31:51 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtkmenu.c (gtk_menu_leave_notify): Fix test for "active
+       submenu".
+
 2002-03-15 Padraig O'Briain <padraig.obriain@sun.com>
 
        * gdk/x11/gdkkeys-x11.c (update_keymaps): Fudge keymap to have lower

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index b84b2e192ffe065edf28a541a115e6c046afd261..f4fbf605130e3be4b8557aea7790aea6af522d23 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Fri Mar 15 13:31:51 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtkmenu.c (gtk_menu_leave_notify): Fix test for "active
+       submenu".
+
 2002-03-15 Padraig O'Briain <padraig.obriain@sun.com>
 
        * gdk/x11/gdkkeys-x11.c (update_keymaps): Fudge keymap to have lower

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b84b2e192ffe065edf28a541a115e6c046afd261..f4fbf605130e3be4b8557aea7790aea6af522d23 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Fri Mar 15 13:31:51 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtkmenu.c (gtk_menu_leave_notify): Fix test for "active
+       submenu".
+
 2002-03-15 Padraig O'Briain <padraig.obriain@sun.com>
 
        * gdk/x11/gdkkeys-x11.c (update_keymaps): Fudge keymap to have lower

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b84b2e192ffe065edf28a541a115e6c046afd261..f4fbf605130e3be4b8557aea7790aea6af522d23 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Fri Mar 15 13:31:51 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtkmenu.c (gtk_menu_leave_notify): Fix test for "active
+       submenu".
+
 2002-03-15 Padraig O'Briain <padraig.obriain@sun.com>
 
        * gdk/x11/gdkkeys-x11.c (update_keymaps): Fudge keymap to have lower

diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index e211b298107617e162cced9e4acac2004513d21d..47db2b26bf9cc00b7b97eee3ea83011206da38ae 100644 (file)
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -2133,7 +2133,7 @@ gtk_menu_leave_notify (GtkWidget        *widget,
       && menu_item->submenu != NULL
       && menu_item->submenu_placement == GTK_LEFT_RIGHT)
     {
-      if (menu_item->submenu->window != NULL) 
+      if (GTK_MENU_SHELL (menu_item->submenu)->active)
        {
          gtk_menu_set_submenu_navigation_region (menu, menu_item, event);
          return TRUE;