AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

in gtk_menu_set_submenu_navigation_region do stop_navigating_submenu, to

Browse Source 
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
This commit is contained in:
George Lebl 2000-09-08 01:53:46 +00:00 committed by George Lebl
parent 7e928a4b2d
commit 38a656ab18
8 changed files with 52 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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> 2000-09-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/makefile.mingw.in: Use -Wall. Add gdkpango-win32.o * gdk/win32/makefile.mingw.in: Use -Wall. Add gdkpango-win32.o

7
ChangeLog.pre-2-0
View File

@ -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> 2000-09-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/makefile.mingw.in: Use -Wall. Add gdkpango-win32.o * gdk/win32/makefile.mingw.in: Use -Wall. Add gdkpango-win32.o

7
ChangeLog.pre-2-10
View File

@ -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> 2000-09-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/makefile.mingw.in: Use -Wall. Add gdkpango-win32.o * gdk/win32/makefile.mingw.in: Use -Wall. Add gdkpango-win32.o

7
ChangeLog.pre-2-2
View File

@ -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> 2000-09-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/makefile.mingw.in: Use -Wall. Add gdkpango-win32.o * gdk/win32/makefile.mingw.in: Use -Wall. Add gdkpango-win32.o

7
ChangeLog.pre-2-4
View File

@ -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> 2000-09-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/makefile.mingw.in: Use -Wall. Add gdkpango-win32.o * gdk/win32/makefile.mingw.in: Use -Wall. Add gdkpango-win32.o

7
ChangeLog.pre-2-6
View File

@ -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> 2000-09-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/makefile.mingw.in: Use -Wall. Add gdkpango-win32.o * gdk/win32/makefile.mingw.in: Use -Wall. Add gdkpango-win32.o

7
ChangeLog.pre-2-8
View File

@ -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> 2000-09-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/makefile.mingw.in: Use -Wall. Add gdkpango-win32.o * gdk/win32/makefile.mingw.in: Use -Wall. Add gdkpango-win32.o

7
gtk/gtkmenu.c
View File

@ -1168,6 +1168,8 @@ gtk_menu_motion_notify (GtkWidget *widget,
*/ */
gint width, height; gint width, height;
menu_shell->ignore_enter = FALSE;
gdk_window_get_size (event->window, &width, &height); gdk_window_get_size (event->window, &width, &height);
if (event->x >= 0 && event->x < width && if (event->x >= 0 && event->x < width &&
event->y >= 0 && event->y < height) event->y >= 0 && event->y < height)
@ -1191,8 +1193,6 @@ gtk_menu_motion_notify (GtkWidget *widget,
*/ */
return gtk_widget_event (widget, &send_event); return gtk_widget_event (widget, &send_event);
} }
menu_shell->ignore_enter = FALSE;
} }
return FALSE; return FALSE;
@ -1384,8 +1384,7 @@ gtk_menu_set_submenu_navigation_region (GtkMenu *menu,
point[2].x = point[1].x; point[2].x = point[1].x;
point[2].y = point[0].y; point[2].y = point[0].y;
if (menu->navigation_region) gtk_menu_stop_navigating_submenu (menu);
gdk_region_destroy (menu->navigation_region);
menu->navigation_region = gdk_region_polygon (point, 3, GDK_WINDING_RULE); menu->navigation_region = gdk_region_polygon (point, 3, GDK_WINDING_RULE);