From 7678a1ed1606f3cd696b1402f449d33de6856636 Mon Sep 17 00:00:00 2001 From: Soeren Sandmann Date: Fri, 15 Mar 2002 13:15:17 +0000 Subject: [PATCH] Fix test for "active submenu". Fri Mar 15 13:31:51 2002 Soeren Sandmann * gtk/gtkmenu.c (gtk_menu_leave_notify): Fix test for "active submenu". --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkmenu.c | 2 +- 8 files changed, 36 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b84b2e192f..f4fbf60513 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Mar 15 13:31:51 2002 Soeren Sandmann + + * gtk/gtkmenu.c (gtk_menu_leave_notify): Fix test for "active + submenu". + 2002-03-15 Padraig O'Briain * 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 b84b2e192f..f4fbf60513 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Fri Mar 15 13:31:51 2002 Soeren Sandmann + + * gtk/gtkmenu.c (gtk_menu_leave_notify): Fix test for "active + submenu". + 2002-03-15 Padraig O'Briain * 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 b84b2e192f..f4fbf60513 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Fri Mar 15 13:31:51 2002 Soeren Sandmann + + * gtk/gtkmenu.c (gtk_menu_leave_notify): Fix test for "active + submenu". + 2002-03-15 Padraig O'Briain * 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 b84b2e192f..f4fbf60513 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Fri Mar 15 13:31:51 2002 Soeren Sandmann + + * gtk/gtkmenu.c (gtk_menu_leave_notify): Fix test for "active + submenu". + 2002-03-15 Padraig O'Briain * 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 b84b2e192f..f4fbf60513 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Fri Mar 15 13:31:51 2002 Soeren Sandmann + + * gtk/gtkmenu.c (gtk_menu_leave_notify): Fix test for "active + submenu". + 2002-03-15 Padraig O'Briain * 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 b84b2e192f..f4fbf60513 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Fri Mar 15 13:31:51 2002 Soeren Sandmann + + * gtk/gtkmenu.c (gtk_menu_leave_notify): Fix test for "active + submenu". + 2002-03-15 Padraig O'Briain * 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 b84b2e192f..f4fbf60513 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Fri Mar 15 13:31:51 2002 Soeren Sandmann + + * gtk/gtkmenu.c (gtk_menu_leave_notify): Fix test for "active + submenu". + 2002-03-15 Padraig O'Briain * gdk/x11/gdkkeys-x11.c (update_keymaps): Fudge keymap to have lower diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index e211b29810..47db2b26bf 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;