Merge branch 'ole2-dnd-check-for-move' into 'gtk-3-24'

OLE2 DND: Check if move is supported See merge request GNOME/gtk!5748
2023-04-06 12:46:11 +00:00
parent afeded7e95 71fcbce0d7
commit 048d23c36d
1 changed files with 3 additions and 1 deletions
--- a/gdk/win32/gdkdnd-win32.c
+++ b/gdk/win32/gdkdnd-win32.c
@ -2152,7 +2152,9 @@ _gdk_win32_dnd_do_dragdrop (void)
    			 g_strdup_printf ("%#.8lx", hr))))));

  /* Delete dnd selection after successful move */
-  if (hr == DRAGDROP_S_DROP && dwEffect == DROPEFFECT_MOVE)
+  if (hr == DRAGDROP_S_DROP &&
+      dwEffect == DROPEFFECT_MOVE &&
+      (drag_ctx->actions & GDK_ACTION_MOVE))
    {
      GdkWin32Selection *win32_sel = _gdk_win32_selection_get ();
      GdkEvent tmp_event;