From 0386be5f06fa1f2ae71b9e500f693410e424bc5d Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 4 Dec 2008 00:17:36 +0000 Subject: [PATCH] don't call DragFinish() before calling DragQueryPoint() or we (naturally) don't get the correct answer from the query (#10238) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@57099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/changes.txt | 1 + src/msw/window.cpp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/changes.txt b/docs/changes.txt index 53ab012362..55aa99c942 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -130,6 +130,7 @@ wxMSW: if the event handler causes window update. - Fix display enumeration under WinCE (Vince Harron). - Fix best size calculation for wxNotebook with multiple rows (Alex McCarthy). +- Correct coordinates of wxDropFilesEvent (Dmitriy Maksimov). wxGTK: diff --git a/src/msw/window.cpp b/src/msw/window.cpp index 4fc42b5730..d8284a26ed 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -4017,7 +4017,6 @@ bool wxWindowMSW::HandleDropFiles(WXWPARAM wParam) ::DragQueryFile(hFilesInfo, wIndex, wxStringBuffer(files[wIndex], len), len); } - DragFinish (hFilesInfo); wxDropFilesEvent event(wxEVT_DROP_FILES, gwFilesDropped, files); event.SetEventObject(this); @@ -4027,6 +4026,8 @@ bool wxWindowMSW::HandleDropFiles(WXWPARAM wParam) event.m_pos.x = dropPoint.x; event.m_pos.y = dropPoint.y; + DragFinish(hFilesInfo); + return GetEventHandler()->ProcessEvent(event); #endif }