Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Exclude DragAcceptFiles() when wxUSE_DRAG_AND_DROP==0

Browse Source 
(backport of 42b2675806)
This commit is contained in:
Paul Cornett
2016-12-22 22:23:38 -08:00
parent e7443259de
commit c047751abf
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/msw/window.h
View File

@@ -120,10 +120,10 @@ public:
#if wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
virtual void SetDropTarget( wxDropTarget *dropTarget ); virtual void SetDropTarget( wxDropTarget *dropTarget );
#endif // wxUSE_DRAG_AND_DROP
// Accept files for dragging // Accept files for dragging
virtual void DragAcceptFiles(bool accept); virtual void DragAcceptFiles(bool accept);
#endif // wxUSE_DRAG_AND_DROP
#ifndef __WXUNIVERSAL__ #ifndef __WXUNIVERSAL__
// Native resource loading (implemented in src/msw/nativdlg.cpp) // Native resource loading (implemented in src/msw/nativdlg.cpp)

2
src/msw/window.cpp
View File

@@ -1701,7 +1701,6 @@ void wxWindowMSW::SetDropTarget(wxDropTarget *pDropTarget)
m_dropTarget->Register(m_hWnd); m_dropTarget->Register(m_hWnd);
} }
} }
#endif // wxUSE_DRAG_AND_DROP
// old-style file manager drag&drop support: we retain the old-style // old-style file manager drag&drop support: we retain the old-style
// DragAcceptFiles in parallel with SetDropTarget. // DragAcceptFiles in parallel with SetDropTarget.
@@ -1716,6 +1715,7 @@ void wxWindowMSW::DragAcceptFiles(bool WXUNUSED_IN_WINCE(accept))
} }
#endif #endif
} }
#endif // wxUSE_DRAG_AND_DROP
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// tooltips // tooltips