in gtk_menu_set_submenu_navigation_region do stop_navigating_submenu, to

Thu Sep 07 20:54:33 2000  George Lebl <jirka@5z.com>

	* 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

diff --git a/ChangeLog b/ChangeLog
index 7771532133bb32d9eddf063b06c6e3f0384a5f5b..1c1b8431680af5e882d1ee5a405bafa8b8736517 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Sep 07 20:54:33 2000  George Lebl <jirka@5z.com>
+
+       * 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  <tml@iki.fi>
 
        * gdk/win32/makefile.mingw.in: Use -Wall. Add gdkpango-win32.o

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 7771532133bb32d9eddf063b06c6e3f0384a5f5b..1c1b8431680af5e882d1ee5a405bafa8b8736517 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+Thu Sep 07 20:54:33 2000  George Lebl <jirka@5z.com>
+
+       * 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  <tml@iki.fi>
 
        * gdk/win32/makefile.mingw.in: Use -Wall. Add gdkpango-win32.o

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7771532133bb32d9eddf063b06c6e3f0384a5f5b..1c1b8431680af5e882d1ee5a405bafa8b8736517 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Thu Sep 07 20:54:33 2000  George Lebl <jirka@5z.com>
+
+       * 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  <tml@iki.fi>
 
        * gdk/win32/makefile.mingw.in: Use -Wall. Add gdkpango-win32.o

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 7771532133bb32d9eddf063b06c6e3f0384a5f5b..1c1b8431680af5e882d1ee5a405bafa8b8736517 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Thu Sep 07 20:54:33 2000  George Lebl <jirka@5z.com>
+
+       * 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  <tml@iki.fi>
 
        * gdk/win32/makefile.mingw.in: Use -Wall. Add gdkpango-win32.o

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 7771532133bb32d9eddf063b06c6e3f0384a5f5b..1c1b8431680af5e882d1ee5a405bafa8b8736517 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Thu Sep 07 20:54:33 2000  George Lebl <jirka@5z.com>
+
+       * 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  <tml@iki.fi>
 
        * gdk/win32/makefile.mingw.in: Use -Wall. Add gdkpango-win32.o

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 7771532133bb32d9eddf063b06c6e3f0384a5f5b..1c1b8431680af5e882d1ee5a405bafa8b8736517 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Thu Sep 07 20:54:33 2000  George Lebl <jirka@5z.com>
+
+       * 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  <tml@iki.fi>
 
        * gdk/win32/makefile.mingw.in: Use -Wall. Add gdkpango-win32.o

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 7771532133bb32d9eddf063b06c6e3f0384a5f5b..1c1b8431680af5e882d1ee5a405bafa8b8736517 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Thu Sep 07 20:54:33 2000  George Lebl <jirka@5z.com>
+
+       * 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  <tml@iki.fi>
 
        * gdk/win32/makefile.mingw.in: Use -Wall. Add gdkpango-win32.o

diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 9342242d3700d0cf3badae378d9024f95665841e..9d3d5e36b3f70f03a5c91d3e335669d95a3f62dd 100644 (file)
--- 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);