diff options
| author | Carlos Garnacho <carlosg@gnome.org> | 2015-11-26 19:54:54 +0100 |
|---|---|---|
| committer | Carlos Garnacho <carlosg@gnome.org> | 2015-12-15 00:32:55 +0100 |
| commit | d54f208d2969550c9eb182b2d5f6173021a1ff34 (patch) | |
| tree | 44bfcedfebb095983590dfdde19cea92a1cd1823 /gtk/gtkmenushell.c | |
| parent | 5cbbb90e311d95192d1b68ba89c3190cdb652868 (diff) | |
| download | gtk+-d54f208d2969550c9eb182b2d5f6173021a1ff34.tar.gz | |
GtkMenu: Use gdk_seat_grab()
https://bugzilla.gnome.org/show_bug.cgi?id=759309
Diffstat (limited to 'gtk/gtkmenushell.c')
| -rw-r--r-- | gtk/gtkmenushell.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c index 2706afdb4c..4eb22ef51f 100644 --- a/gtk/gtkmenushell.c +++ b/gtk/gtkmenushell.c @@ -626,7 +626,7 @@ gtk_menu_shell_activate (GtkMenuShell *menu_shell) device = gtk_get_current_event_device (); _gtk_menu_shell_set_grab_device (menu_shell, device); - gtk_device_grab_add (GTK_WIDGET (menu_shell), device, TRUE); + gtk_grab_add (GTK_WIDGET (menu_shell)); priv->have_grab = TRUE; priv->active = TRUE; @@ -1173,18 +1173,11 @@ gtk_real_menu_shell_deactivate (GtkMenuShell *menu_shell) if (priv->have_grab) { priv->have_grab = FALSE; - gtk_device_grab_remove (GTK_WIDGET (menu_shell), priv->grab_pointer); + gtk_grab_remove (GTK_WIDGET (menu_shell)); } if (priv->have_xgrab) { - GdkDevice *keyboard; - - gdk_device_ungrab (priv->grab_pointer, GDK_CURRENT_TIME); - keyboard = gdk_device_get_associated_device (priv->grab_pointer); - - if (keyboard) - gdk_device_ungrab (keyboard, GDK_CURRENT_TIME); - + gdk_seat_ungrab (gdk_device_get_seat (priv->grab_pointer)); priv->have_xgrab = FALSE; } |