summaryrefslogtreecommitdiff
path: root/gtk/gtkmenushell.c
diff options
context:
space:
mode:
authorTim Janik <timj@gimp.org>1998-03-15 21:46:03 +0000
committerTim Janik <timj@src.gnome.org>1998-03-15 21:46:03 +0000
commit0ac28d23a45acb94bb0d488b93e0150690c360a5 (patch)
treef37b3c96c390eee35b37c9d6fac14da4c690e4fb /gtk/gtkmenushell.c
parentced74f443535404294518431022d459cb79b1a4e (diff)
downloadgtk+-0ac28d23a45acb94bb0d488b93e0150690c360a5.tar.gz
for now reverted the last change, since it broke click-select-click menus
Sun Mar 15 22:44:33 1998 Tim Janik <timj@gimp.org> * gtk/gtkmenushell.c (gtk_menu_shell_button_release): for now reverted the last change, since it broke click-select-click menus for gimp.
Diffstat (limited to 'gtk/gtkmenushell.c')
-rw-r--r--gtk/gtkmenushell.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c
index 8b362ee66e..0763952f57 100644
--- a/gtk/gtkmenushell.c
+++ b/gtk/gtkmenushell.c
@@ -303,7 +303,7 @@ gtk_menu_shell_button_press (GtkWidget *widget,
menu_shell->active = TRUE;
}
menu_shell->button = event->button;
-
+
menu_item = gtk_get_event_widget ((GdkEvent*) event);
if (!GTK_WIDGET_IS_SENSITIVE (menu_item))
@@ -350,8 +350,9 @@ gtk_menu_shell_button_release (GtkWidget *widget,
menu_shell = GTK_MENU_SHELL (widget);
if (menu_shell->active)
{
- if (event->button != menu_shell->button)
+ if (menu_shell->button && (event->button != menu_shell->button))
{
+ menu_shell->button = 0;
if (menu_shell->parent_menu_shell)
gtk_widget_event (menu_shell->parent_menu_shell, (GdkEvent*) event);
return TRUE;