From c047751abfeb925f298c2dfddb2a9dfb1d26e1b7 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Thu, 22 Dec 2016 22:23:38 -0800 Subject: [PATCH] Exclude DragAcceptFiles() when wxUSE_DRAG_AND_DROP==0 (backport of 42b2675806dfcb0e19863ce8a31afcc3f1f6d183) --- include/wx/msw/window.h | 2 +- src/msw/window.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h index 68ed583118..6e225260bf 100644 --- a/include/wx/msw/window.h +++ b/include/wx/msw/window.h @@ -120,10 +120,10 @@ public: #if wxUSE_DRAG_AND_DROP virtual void SetDropTarget( wxDropTarget *dropTarget ); -#endif // wxUSE_DRAG_AND_DROP // Accept files for dragging virtual void DragAcceptFiles(bool accept); +#endif // wxUSE_DRAG_AND_DROP #ifndef __WXUNIVERSAL__ // Native resource loading (implemented in src/msw/nativdlg.cpp) diff --git a/src/msw/window.cpp b/src/msw/window.cpp index 584116a34d..ba0d5fd569 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -1701,7 +1701,6 @@ void wxWindowMSW::SetDropTarget(wxDropTarget *pDropTarget) m_dropTarget->Register(m_hWnd); } } -#endif // wxUSE_DRAG_AND_DROP // old-style file manager drag&drop support: we retain the old-style // DragAcceptFiles in parallel with SetDropTarget. @@ -1716,6 +1715,7 @@ void wxWindowMSW::DragAcceptFiles(bool WXUNUSED_IN_WINCE(accept)) } #endif } +#endif // wxUSE_DRAG_AND_DROP // ---------------------------------------------------------------------------- // tooltips