Commit 7b6c536c authored by Michael Natterer's avatar Michael Natterer Committed by Michael Natterer

Make sure menu_shell->button gets reset to 0 when we bail out early here

2007-09-11  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkmenu.c (gtk_menu_button_release): Make sure
	menu_shell->button gets reset to 0 when we bail out early here
	instead of chaining up, so it is in a consistent state for the
	next press/release in GtkMenuShell. Fixes bug #449371.


svn path=/trunk/; revision=18795
parent 942f3246
2007-09-11 Michael Natterer <mitch@imendio.com>
* gtk/gtkmenu.c (gtk_menu_button_release): Make sure
menu_shell->button gets reset to 0 when we bail out early here
instead of chaining up, so it is in a consistent state for the
next press/release in GtkMenuShell. Fixes bug #449371.
2007-09-10 Kjartan Maraas <kmaraas@gnome.org>
* gtk/gtkentry.c: Fix some typos. Closes bug #475400.
......
......@@ -2710,7 +2710,17 @@ gtk_menu_button_release (GtkWidget *widget,
*/
if (GTK_IS_MENU_SHELL (gtk_get_event_widget ((GdkEvent *) event)) &&
pointer_in_menu_window (widget, event->x_root, event->y_root))
return TRUE;
{
/* Ugly: make sure menu_shell->button gets reset to 0 when we
* bail out early here so it is in a consistent state for the
* next button_press/button_release in GtkMenuShell.
* See bug #449371.
*/
if (GTK_MENU_SHELL (widget)->active)
GTK_MENU_SHELL (widget)->button = 0;
return TRUE;
}
return GTK_WIDGET_CLASS (gtk_menu_parent_class)->button_release_event (widget, event);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment