Commit 9eb5ea7d authored by Matthias Clasen's avatar Matthias Clasen Committed by Matthias Clasen

Only cancel if the menu was active. (#314298, Christian Persch, analysis

2005-08-29  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkmenu.c (gtk_menu_grab_notify): Only cancel if the menu
	was active.  (#314298, Christian Persch, analysis by Mark McLoughlin)
parent e7f084dc
2005-08-29 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkmenu.c (gtk_menu_grab_notify): Only cancel if the menu
was active. (#314298, Christian Persch, analysis by Mark McLoughlin)
2005-08-29 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkiconcache.c (_gtk_icon_cache_get_icon): Remove an
......
2005-08-29 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkmenu.c (gtk_menu_grab_notify): Only cancel if the menu
was active. (#314298, Christian Persch, analysis by Mark McLoughlin)
2005-08-29 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkiconcache.c (_gtk_icon_cache_get_icon): Remove an
......
......@@ -4419,7 +4419,7 @@ gtk_menu_grab_notify (GtkWidget *widget,
if (!was_grabbed)
{
if (!GTK_IS_MENU_SHELL (grab))
if (GTK_MENU_SHELL (widget)->active && !GTK_IS_MENU_SHELL (grab))
gtk_menu_shell_cancel (GTK_MENU_SHELL (widget));
}
}
......
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