From: Vadim Zeitlin Date: Fri, 20 Oct 2006 14:33:49 +0000 (+0000) Subject: put #if wxUSE_STATBOX around wxStaticBox usage (bug 1568939) X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/3febc967a929bd07e339bc19d799cf0315e1802a put #if wxUSE_STATBOX around wxStaticBox usage (bug 1568939) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42169 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/msw/window.cpp b/src/msw/window.cpp index 7f55f0db5b..3ce32c9ef1 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -1539,9 +1539,13 @@ void wxWindowMSW::Update() // drag and drop // --------------------------------------------------------------------------- +#if wxUSE_DRAG_AND_DROP || !defined(__WXWINCE__) + +#if wxUSE_STATBOX + // we need to lower the sibling static boxes so controls contained within can be // a drop target -static inline void AdjustStaticBoxZOrder(wxWindow *parent) +static void AdjustStaticBoxZOrder(wxWindow *parent) { // no sibling static boxes if we have no parent (ie TLW) if ( !parent ) @@ -1560,6 +1564,16 @@ static inline void AdjustStaticBoxZOrder(wxWindow *parent) } } +#else // !wxUSE_STATBOX + +static inline void AdjustStaticBoxZOrder(wxWindow * WXUNUSED(parent)) +{ +} + +#endif // wxUSE_STATBOX/!wxUSE_STATBOX + +#endif // drag and drop is used + #if wxUSE_DRAG_AND_DROP void wxWindowMSW::SetDropTarget(wxDropTarget *pDropTarget) {