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

Ensure that AdjustStaticBoxZOrder is always defined

Browse Source 
Fix the build in wxUSE_STATBOX=0 and wxUSE_DRAG_AND_DROP=0 case:
AdjustStaticBoxZOrder() must still be defined as it's also used in
DragAcceptFiles().

Closes https://github.com/wxWidgets/wxWidgets/pull/111
This commit is contained in:
Ian Langworth
2015-10-07 13:15:55 -07:00
committed by Vadim Zeitlin
parent 55c76ed087
commit c739671796
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/msw/window.cpp
View File

@@ -1522,8 +1522,6 @@ void wxWindowMSW::Update()
// drag and drop // drag and drop
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
#if wxUSE_DRAG_AND_DROP
#if wxUSE_STATBOX #if wxUSE_STATBOX
// we need to lower the sibling static boxes so controls contained within can be // we need to lower the sibling static boxes so controls contained within can be
@@ -1555,9 +1553,8 @@ static inline void AdjustStaticBoxZOrder(wxWindow * WXUNUSED(parent))
#endif // wxUSE_STATBOX/!wxUSE_STATBOX #endif // wxUSE_STATBOX/!wxUSE_STATBOX
#endif // drag and drop is used
#if wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
void wxWindowMSW::SetDropTarget(wxDropTarget *pDropTarget) void wxWindowMSW::SetDropTarget(wxDropTarget *pDropTarget)
{ {
if ( m_dropTarget != 0 ) { if ( m_dropTarget != 0 ) {
@@ -1572,6 +1569,7 @@ void wxWindowMSW::SetDropTarget(wxDropTarget *pDropTarget)
m_dropTarget->Register(m_hWnd); m_dropTarget->Register(m_hWnd);
} }
} }
#endif // wxUSE_DRAG_AND_DROP #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