summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSoeren Sandmann <sandmann@daimi.au.dk>2002-03-15 13:15:17 +0000
committerSøren Sandmann Pedersen <ssp@src.gnome.org>2002-03-15 13:15:17 +0000
commit7678a1ed1606f3cd696b1402f449d33de6856636 (patch)
tree4cfef4715c4099a91e3f7b91d37925d84e46d74c
parentab62fadd82f5ee05da26942832a5a8d72de91c2b (diff)
downloadgdk-pixbuf-7678a1ed1606f3cd696b1402f449d33de6856636.tar.gz
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".
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-2-05
-rw-r--r--ChangeLog.pre-2-105
-rw-r--r--ChangeLog.pre-2-25
-rw-r--r--ChangeLog.pre-2-45
-rw-r--r--ChangeLog.pre-2-65
-rw-r--r--ChangeLog.pre-2-85
-rw-r--r--gtk/gtkmenu.c2
8 files changed, 36 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b84b2e192..f4fbf6051 100644
--- 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 b84b2e192..f4fbf6051 100644
--- 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 b84b2e192..f4fbf6051 100644
--- 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 b84b2e192..f4fbf6051 100644
--- 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 b84b2e192..f4fbf6051 100644
--- 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 b84b2e192..f4fbf6051 100644
--- 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 b84b2e192..f4fbf6051 100644
--- 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 e211b2981..47db2b26b 100644
--- 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;