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

Implement DragAcceptFiles() only when wxUSE_DRAG_AND_DROP==1

Browse Source 
This virtual method is implemented in wxWindowBase class only when
wxUSE_DRAG_AND_DROP==1, so it should be re-implemented in the derived class
wxWindowMac also only when wxUSE_DRAG_AND_DROP==1.
This commit is contained in:
Artur Wieczorek
2017-08-01 20:47:28 +02:00
parent f81cc8e61e
commit 8dd2ac3016
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,10 +122,10 @@ public:
#if wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
virtual void SetDropTarget( wxDropTarget *dropTarget ) wxOVERRIDE; virtual void SetDropTarget( wxDropTarget *dropTarget ) wxOVERRIDE;
#endif
// Accept files for dragging // Accept files for dragging
virtual void DragAcceptFiles( bool accept ) wxOVERRIDE; virtual void DragAcceptFiles( bool accept ) wxOVERRIDE;
#endif
// implementation from now on // implementation from now on
// -------------------------- // --------------------------

3
src/osx/window_osx.cpp
View File

@@ -639,13 +639,12 @@ void wxWindowMac::SetDropTarget(wxDropTarget *pDropTarget)
GetPeer()->SetDropTarget(m_dropTarget) ; GetPeer()->SetDropTarget(m_dropTarget) ;
} }
#endif
// Old-style File Manager Drag & Drop // Old-style File Manager Drag & Drop
void wxWindowMac::DragAcceptFiles(bool WXUNUSED(accept)) void wxWindowMac::DragAcceptFiles(bool WXUNUSED(accept))
{ {
// TODO: // TODO:
} }
#endif
// From a wx position / size calculate the appropriate size of the native control // From a wx position / size calculate the appropriate size of the native control