summaryrefslogtreecommitdiff
path: root/gtk/gtkmenushell.c
diff options
context:
space:
mode:
Diffstat (limited to 'gtk/gtkmenushell.c')
-rw-r--r--gtk/gtkmenushell.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c
index 3bbceeeb52..18386950c2 100644
--- a/gtk/gtkmenushell.c
+++ b/gtk/gtkmenushell.c
@@ -605,6 +605,7 @@ gtk_menu_shell_realize (GtkWidget *widget)
attributes.event_mask |= (GDK_EXPOSURE_MASK |
GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK |
+ GDK_POINTER_MOTION_MASK |
GDK_KEY_PRESS_MASK |
GDK_ENTER_NOTIFY_MASK |
GDK_LEAVE_NOTIFY_MASK);
@@ -648,9 +649,6 @@ gtk_menu_shell_button_press (GtkWidget *widget,
GtkWidget *menu_item;
GtkWidget *parent;
- if (event->type == GDK_2BUTTON_PRESS)
- return _gtk_window_handle_button_press_for_widget (widget, event);
-
if (event->type != GDK_BUTTON_PRESS)
return FALSE;
@@ -706,8 +704,8 @@ gtk_menu_shell_button_press (GtkWidget *widget,
{
if (!initially_active)
{
- if (_gtk_window_handle_button_press_for_widget (widget, event))
- gtk_menu_shell_deactivate (menu_shell);
+ gtk_menu_shell_deactivate (menu_shell);
+ return FALSE;
}
}
}