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 7f55f0db5bc6ce10aa7a20d22e3c82ea7ba84fee..3ce32c9ef11c0da01f18c6e1a97aca6de9c338cb 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -1539,9 +1539,13 @@ void wxWindowMSW::Update()
 // drag and drop
 // ---------------------------------------------------------------------------
 
 // 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
 // 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 )
 {
     // 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)
 {
 #if wxUSE_DRAG_AND_DROP
 void wxWindowMSW::SetDropTarget(wxDropTarget *pDropTarget)
 {