From b6c593af4564ea1454daab631fded7abd62c447d Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 3 May 2020 03:13:01 +0200 Subject: [PATCH] Fix regression in MSW DoDragDrop() return code It always returned wxDragNone since the changes of f5548e399e (Fix problem with dragged icon remaining on screen under MSW 10, 2020-01-11) which wrongly changed pdwEffect to DROPEFFECT_NONE before doing anything else, disregarding the fact that it's an in-out parameter and not just an output one. Fix this by simply not doing this, just as it hadn't been done before. See #18499. --- src/msw/ole/droptgt.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/msw/ole/droptgt.cpp b/src/msw/ole/droptgt.cpp index d97b08ccad..57c4472b0b 100644 --- a/src/msw/ole/droptgt.cpp +++ b/src/msw/ole/droptgt.cpp @@ -371,9 +371,6 @@ STDMETHODIMP wxIDropTarget::Drop(IDataObject *pIDataSource, wxLogLastError(wxT("ScreenToClient")); } - // Initialize it to a safe value in case OnDrop() throws. - *pdwEffect = DROPEFFECT_NONE; - // Create a guard that will clean things up in case of exception: we // must perform it in any case, as if we don't update the drag image it // would remain on screen under Windows 10, see #18499.