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

Fix build error with wxUSE_DRAG_AND_DROP==0

Browse Source
This commit is contained in:
Paul Cornett
2016-12-22 22:12:45 -08:00
parent 64f1d760c6
commit 42b2675806
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -135,10 +135,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 // wxUSE_DRAG_AND_DROP
// Accept files for dragging // Accept files for dragging
virtual void DragAcceptFiles(bool accept) wxOVERRIDE; virtual void DragAcceptFiles(bool accept) wxOVERRIDE;
#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)

3
src/msw/window.cpp
View File

@@ -1594,8 +1594,6 @@ void wxWindowMSW::SetDropTarget(wxDropTarget *pDropTarget)
} }
} }
#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.
void wxWindowMSW::DragAcceptFiles(bool accept) void wxWindowMSW::DragAcceptFiles(bool accept)
@@ -1607,6 +1605,7 @@ void wxWindowMSW::DragAcceptFiles(bool accept)
::DragAcceptFiles(hWnd, (BOOL)accept); ::DragAcceptFiles(hWnd, (BOOL)accept);
} }
} }
#endif // wxUSE_DRAG_AND_DROP
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// tooltips // tooltips