callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

win32: Remove deprecation warnings in dnd code

Browse Source
This commit is contained in:
Benjamin Otte 2016-02-06 02:18:54 +01:00 committed by Benjamin Otte
parent 4ce6d10601
commit 766b1b9886
1 changed files with 15 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
gdk/win32/gdkdnd-win32.c
View File

@ -1161,8 +1161,7 @@ target_context_new (GdkWindow *window)
GdkDragContext *context; GdkDragContext *context;
GdkWin32DragContext *context_win32; GdkWin32DragContext *context_win32;
target_drag_context *result; target_drag_context *result;
GdkDevice *device; GdkSeat *seat;
GdkDeviceManager *device_manager;
context = gdk_drag_context_new (); context = gdk_drag_context_new ();
context_win32 = GDK_WIN32_DRAG_CONTEXT (context); context_win32 = GDK_WIN32_DRAG_CONTEXT (context);
@ -1174,9 +1173,8 @@ target_context_new (GdkWindow *window)
result->context->protocol = GDK_DRAG_PROTO_OLE2; result->context->protocol = GDK_DRAG_PROTO_OLE2;
result->context->is_source = FALSE; result->context->is_source = FALSE;
device_manager = gdk_display_get_device_manager (_gdk_display); seat = gdk_display_get_default_seat (_gdk_display);
device = gdk_device_manager_get_client_pointer (device_manager); gdk_drag_context_set_device (context, gdk_seat_get_pointer (seat));
gdk_drag_context_set_device (result->context, device);
result->context->source_window = NULL; result->context->source_window = NULL;
@ -1203,8 +1201,7 @@ source_context_new (GdkWindow *window,
GdkDragContext *context; GdkDragContext *context;
GdkWin32DragContext *context_win32; GdkWin32DragContext *context_win32;
source_drag_context *result; source_drag_context *result;
GdkDevice *device; GdkSeat *seat;
GdkDeviceManager *device_manager;
context = gdk_drag_context_new (); context = gdk_drag_context_new ();
context_win32 = GDK_WIN32_DRAG_CONTEXT (context); context_win32 = GDK_WIN32_DRAG_CONTEXT (context);
@ -1216,9 +1213,8 @@ source_context_new (GdkWindow *window,
result->context->protocol = GDK_DRAG_PROTO_OLE2; result->context->protocol = GDK_DRAG_PROTO_OLE2;
result->context->is_source = TRUE; result->context->is_source = TRUE;
device_manager = gdk_display_get_device_manager (_gdk_display); seat = gdk_display_get_default_seat (_gdk_display);
device = gdk_device_manager_get_client_pointer (device_manager); gdk_drag_context_set_device (context, gdk_seat_get_pointer (seat));
gdk_drag_context_set_device (result->context, device);
result->context->source_window = window; result->context->source_window = window;
g_object_ref (window); g_object_ref (window);
@ -1430,8 +1426,7 @@ gdk_dropfiles_filter (GdkXEvent *xev,
POINT pt; POINT pt;
gint nfiles, i; gint nfiles, i;
gchar *fileName, *linkedFile; gchar *fileName, *linkedFile;
GdkDevice *device; GdkSeat *seat;
GdkDeviceManager *device_manager;
if (msg->message == WM_DROPFILES) if (msg->message == WM_DROPFILES)
{ {
@ -1441,9 +1436,8 @@ gdk_dropfiles_filter (GdkXEvent *xev,
context->protocol = GDK_DRAG_PROTO_WIN32_DROPFILES; context->protocol = GDK_DRAG_PROTO_WIN32_DROPFILES;
context->is_source = FALSE; context->is_source = FALSE;
device_manager = gdk_display_get_device_manager (_gdk_display); seat = gdk_display_get_default_seat (_gdk_display);
device = gdk_device_manager_get_client_pointer (device_manager); gdk_drag_context_set_device (context, gdk_seat_get_pointer (seat));
gdk_drag_context_set_device (context, device);
context->source_window = gdk_get_default_root_window (); context->source_window = gdk_get_default_root_window ();
g_object_ref (context->source_window); g_object_ref (context->source_window);
@ -1663,8 +1657,7 @@ local_send_enter (GdkDragContext *context,
{ {
GdkEvent *tmp_event; GdkEvent *tmp_event;
GdkDragContext *new_context; GdkDragContext *new_context;
GdkDevice *device; GdkSeat *seat;
GdkDeviceManager *device_manager;
GDK_NOTE (DND, g_print ("local_send_enter: context=%p current_dest_drag=%p\n", GDK_NOTE (DND, g_print ("local_send_enter: context=%p current_dest_drag=%p\n",
context, context,
@ -1680,9 +1673,8 @@ local_send_enter (GdkDragContext *context,
new_context->protocol = GDK_DRAG_PROTO_LOCAL; new_context->protocol = GDK_DRAG_PROTO_LOCAL;
new_context->is_source = FALSE; new_context->is_source = FALSE;
device_manager = gdk_display_get_device_manager (_gdk_display); seat = gdk_display_get_default_seat (_gdk_display);
device = gdk_device_manager_get_client_pointer (device_manager); gdk_drag_context_set_device (context, gdk_seat_get_pointer (seat));
gdk_drag_context_set_device (new_context, device);
new_context->source_window = context->source_window; new_context->source_window = context->source_window;
g_object_ref (new_context->source_window); g_object_ref (new_context->source_window);
@ -1824,22 +1816,18 @@ _gdk_win32_window_drag_begin (GdkWindow *window,
if (!use_ole2_dnd) if (!use_ole2_dnd)
{ {
GdkDragContext *new_context; GdkDragContext *new_context;
GdkDevice *device; GdkSeat *seat;
GdkDeviceManager *device_manager;
g_return_val_if_fail (window != NULL, NULL); g_return_val_if_fail (window != NULL, NULL);
new_context = gdk_drag_context_new (); new_context = gdk_drag_context_new ();
device_manager = gdk_display_get_device_manager (_gdk_display); seat = gdk_display_get_default_seat (_gdk_display);
device = gdk_device_manager_get_client_pointer (device_manager); gdk_drag_context_set_device (new_context, gdk_seat_get_pointer (seat));
gdk_drag_context_set_device (new_context, device);
new_context->is_source = TRUE; new_context->is_source = TRUE;
new_context->source_window = window; new_context->source_window = window;
g_object_ref (window); g_object_ref (window);
gdk_drag_context_set_device (new_context, device);
new_context->targets = g_list_copy (targets); new_context->targets = g_list_copy (targets);
new_context->actions = 0; new_context->actions = 0;