From 38a656ab1881f9013f3b0bdbb2172840d7685638 Mon Sep 17 00:00:00 2001 From: George Lebl Date: Fri, 8 Sep 2000 01:53:46 +0000 Subject: [PATCH] in gtk_menu_set_submenu_navigation_region do stop_navigating_submenu, to Thu Sep 07 20:54:33 2000 George Lebl * gtk/gtkmenu.c: in gtk_menu_set_submenu_navigation_region do stop_navigating_submenu, to clear last timeout properly. Also in gtk_menu_motion_notify move ignore_enter above the conditional to make it always happen as suggested by Owen --- ChangeLog | 7 +++++++ ChangeLog.pre-2-0 | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-2 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gtk/gtkmenu.c | 7 +++---- 8 files changed, 52 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 777153213..1c1b84316 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Thu Sep 07 20:54:33 2000 George Lebl + + * gtk/gtkmenu.c: in gtk_menu_set_submenu_navigation_region + do stop_navigating_submenu, to clear last timeout properly. + Also in gtk_menu_motion_notify move ignore_enter above + the conditional to make it always happen as suggested by Owen + 2000-09-07 Tor Lillqvist * gdk/win32/makefile.mingw.in: Use -Wall. Add gdkpango-win32.o diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 777153213..1c1b84316 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,10 @@ +Thu Sep 07 20:54:33 2000 George Lebl + + * gtk/gtkmenu.c: in gtk_menu_set_submenu_navigation_region + do stop_navigating_submenu, to clear last timeout properly. + Also in gtk_menu_motion_notify move ignore_enter above + the conditional to make it always happen as suggested by Owen + 2000-09-07 Tor Lillqvist * gdk/win32/makefile.mingw.in: Use -Wall. Add gdkpango-win32.o diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 777153213..1c1b84316 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Thu Sep 07 20:54:33 2000 George Lebl + + * gtk/gtkmenu.c: in gtk_menu_set_submenu_navigation_region + do stop_navigating_submenu, to clear last timeout properly. + Also in gtk_menu_motion_notify move ignore_enter above + the conditional to make it always happen as suggested by Owen + 2000-09-07 Tor Lillqvist * gdk/win32/makefile.mingw.in: Use -Wall. Add gdkpango-win32.o diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 777153213..1c1b84316 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +Thu Sep 07 20:54:33 2000 George Lebl + + * gtk/gtkmenu.c: in gtk_menu_set_submenu_navigation_region + do stop_navigating_submenu, to clear last timeout properly. + Also in gtk_menu_motion_notify move ignore_enter above + the conditional to make it always happen as suggested by Owen + 2000-09-07 Tor Lillqvist * gdk/win32/makefile.mingw.in: Use -Wall. Add gdkpango-win32.o diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 777153213..1c1b84316 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Thu Sep 07 20:54:33 2000 George Lebl + + * gtk/gtkmenu.c: in gtk_menu_set_submenu_navigation_region + do stop_navigating_submenu, to clear last timeout properly. + Also in gtk_menu_motion_notify move ignore_enter above + the conditional to make it always happen as suggested by Owen + 2000-09-07 Tor Lillqvist * gdk/win32/makefile.mingw.in: Use -Wall. Add gdkpango-win32.o diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 777153213..1c1b84316 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Thu Sep 07 20:54:33 2000 George Lebl + + * gtk/gtkmenu.c: in gtk_menu_set_submenu_navigation_region + do stop_navigating_submenu, to clear last timeout properly. + Also in gtk_menu_motion_notify move ignore_enter above + the conditional to make it always happen as suggested by Owen + 2000-09-07 Tor Lillqvist * gdk/win32/makefile.mingw.in: Use -Wall. Add gdkpango-win32.o diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 777153213..1c1b84316 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Thu Sep 07 20:54:33 2000 George Lebl + + * gtk/gtkmenu.c: in gtk_menu_set_submenu_navigation_region + do stop_navigating_submenu, to clear last timeout properly. + Also in gtk_menu_motion_notify move ignore_enter above + the conditional to make it always happen as suggested by Owen + 2000-09-07 Tor Lillqvist * gdk/win32/makefile.mingw.in: Use -Wall. Add gdkpango-win32.o diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index 9342242d3..9d3d5e36b 100644 --- a/gtk/gtkmenu.c +++ b/gtk/gtkmenu.c @@ -1168,6 +1168,8 @@ gtk_menu_motion_notify (GtkWidget *widget, */ gint width, height; + menu_shell->ignore_enter = FALSE; + gdk_window_get_size (event->window, &width, &height); if (event->x >= 0 && event->x < width && event->y >= 0 && event->y < height) @@ -1191,8 +1193,6 @@ gtk_menu_motion_notify (GtkWidget *widget, */ return gtk_widget_event (widget, &send_event); } - - menu_shell->ignore_enter = FALSE; } return FALSE; @@ -1384,8 +1384,7 @@ gtk_menu_set_submenu_navigation_region (GtkMenu *menu, point[2].x = point[1].x; point[2].y = point[0].y; - if (menu->navigation_region) - gdk_region_destroy (menu->navigation_region); + gtk_menu_stop_navigating_submenu (menu); menu->navigation_region = gdk_region_polygon (point, 3, GDK_WINDING_RULE); -- 2.43.2