AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-13 05:50:10 +00:00
Code Issues Projects Releases Wiki Activity

gtkdnd: Fix deprecation compile warnings

Browse Source 
Grabbing must stay a bit longer until all other backends than x11/wayland
catch up with GDK DnD, so ignore deprecation flags are used on those. The
uses of GdkDeviceManager can be entirely avoided though.
This commit is contained in:
Carlos Garnacho 2016-01-28 11:58:15 +01:00
parent 27263f2387
commit 0125aa0a41
1 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gtk/gtkdnd.c
View File

@ -438,17 +438,19 @@ grab_dnd_keys (GtkWidget *widget,
window = gtk_widget_get_window (widget); window = gtk_widget_get_window (widget);
if (!GDK_IS_X11_WINDOW (window)) if (!GDK_IS_X11_WINDOW (window))
{ {
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
gdk_device_grab (device, gdk_device_grab (device,
gtk_widget_get_window (widget), gtk_widget_get_window (widget),
GDK_OWNERSHIP_APPLICATION, FALSE, GDK_OWNERSHIP_APPLICATION, FALSE,
GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK, GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK,
NULL, time); NULL, time);
G_GNUC_END_IGNORE_DEPRECATIONS;
return; return;
} }
deviceid = gdk_x11_device_get_id (device); deviceid = gdk_x11_device_get_id (device);
if (GDK_IS_X11_DEVICE_MANAGER_XI2 (gdk_display_get_device_manager (gtk_widget_get_display (widget)))) if (GDK_IS_X11_DEVICE_XI2 (device))
using_xi2 = TRUE; using_xi2 = TRUE;
else else
using_xi2 = FALSE; using_xi2 = FALSE;
@ -522,13 +524,15 @@ ungrab_dnd_keys (GtkWidget *widget,
window = gtk_widget_get_window (widget); window = gtk_widget_get_window (widget);
if (!GDK_IS_X11_WINDOW (window)) if (!GDK_IS_X11_WINDOW (window))
{ {
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
gdk_device_ungrab (device, time); gdk_device_ungrab (device, time);
G_GNUC_END_IGNORE_DEPRECATIONS;
return; return;
} }
deviceid = gdk_x11_device_get_id (device); deviceid = gdk_x11_device_get_id (device);
if (GDK_IS_X11_DEVICE_MANAGER_XI2 (gdk_display_get_device_manager (gtk_widget_get_display (widget)))) if (GDK_IS_X11_DEVICE_XI2 (device))
using_xi2 = TRUE; using_xi2 = TRUE;
else else
using_xi2 = FALSE; using_xi2 = FALSE;
@ -577,11 +581,13 @@ grab_dnd_keys (GtkWidget *widget,
GdkDevice *device, GdkDevice *device,
guint32 time) guint32 time)
{ {
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
gdk_device_grab (device, gdk_device_grab (device,
gtk_widget_get_window (widget), gtk_widget_get_window (widget),
GDK_OWNERSHIP_APPLICATION, FALSE, GDK_OWNERSHIP_APPLICATION, FALSE,
GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK, GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK,
NULL, time); NULL, time);
G_GNUC_END_IGNORE_DEPRECATIONS;
} }
static void static void
@ -589,7 +595,9 @@ ungrab_dnd_keys (GtkWidget *widget,
GdkDevice *device, GdkDevice *device,
guint32 time) guint32 time)
{ {
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
gdk_device_ungrab (device, time); gdk_device_ungrab (device, time);
G_GNUC_END_IGNORE_DEPRECATIONS;
} }
#endif /* GDK_WINDOWING_X11 */ #endif /* GDK_WINDOWING_X11 */
@ -841,11 +849,13 @@ gtk_drag_update_cursor (GtkDragSourceInfo *info)
GdkDevice *pointer; GdkDevice *pointer;
pointer = gdk_drag_context_get_device (info->context); pointer = gdk_drag_context_get_device (info->context);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
gdk_device_grab (pointer, gdk_device_grab (pointer,
gtk_widget_get_window (info->ipc_widget), gtk_widget_get_window (info->ipc_widget),
GDK_OWNERSHIP_APPLICATION, FALSE, GDK_OWNERSHIP_APPLICATION, FALSE,
GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK, GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK,
cursor, info->grab_time); cursor, info->grab_time);
G_GNUC_END_IGNORE_DEPRECATIONS;
info->cursor = cursor; info->cursor = cursor;
} }
} }
@ -2230,11 +2240,17 @@ gtk_drag_begin_internal (GtkWidget *widget,
if (!managed) if (!managed)
{ {
if (gdk_device_grab (pointer, ipc_window, gboolean grabbed;
GDK_OWNERSHIP_APPLICATION, FALSE,
GDK_POINTER_MOTION_MASK | G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
GDK_BUTTON_RELEASE_MASK, grabbed = gdk_device_grab (pointer, ipc_window,
cursor, time) != GDK_GRAB_SUCCESS) GDK_OWNERSHIP_APPLICATION, FALSE,
GDK_POINTER_MOTION_MASK |
GDK_BUTTON_RELEASE_MASK,
cursor, time) == GDK_GRAB_SUCCESS;
G_GNUC_END_IGNORE_DEPRECATIONS;
if (!grabbed)
{ {
gtk_drag_release_ipc_widget (ipc_widget); gtk_drag_release_ipc_widget (ipc_widget);
return NULL; return NULL;
@ -2957,10 +2973,12 @@ _gtk_drag_source_handle_event (GtkWidget *widget,
GdkDevice *pointer; GdkDevice *pointer;
pointer = gdk_drag_context_get_device (context); pointer = gdk_drag_context_get_device (context);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
gdk_device_grab (pointer, gtk_widget_get_window (widget), gdk_device_grab (pointer, gtk_widget_get_window (widget),
GDK_OWNERSHIP_APPLICATION, FALSE, GDK_OWNERSHIP_APPLICATION, FALSE,
GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK, GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK,
cursor, info->grab_time); cursor, info->grab_time);
G_GNUC_END_IGNORE_DEPRECATIONS;
info->cursor = cursor; info->cursor = cursor;
} }
@ -3405,7 +3423,10 @@ gtk_drag_end (GtkDragSourceInfo *info,
gtk_drag_key_cb, gtk_drag_key_cb,
info); info);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
gdk_device_ungrab (pointer, time); gdk_device_ungrab (pointer, time);
G_GNUC_END_IGNORE_DEPRECATIONS;
ungrab_dnd_keys (info->ipc_widget, keyboard, time); ungrab_dnd_keys (info->ipc_widget, keyboard, time);
gtk_device_grab_remove (info->ipc_widget, pointer); gtk_device_grab_remove (info->ipc_widget, pointer);
} }