compilation fix for wxUSE_CONSTRAINTS==0

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18726 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/notebook.h b/include/wx/msw/notebook.h
index 4fd14d30dacc0633da28efdf4d4b27b1b81fdde1..94a70e68c4645362c6483c4fe75540538a2b9cab 100644 (file)
--- a/include/wx/msw/notebook.h
+++ b/include/wx/msw/notebook.h
@@ -117,11 +117,15 @@ public:
 
   // base class virtuals
   // -------------------
+
   virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
   virtual bool MSWOnScroll(int orientation, WXWORD nSBCode,
                            WXWORD pos, WXHWND control);
+
+#if wxUSE_CONSTRAINTS
   virtual void SetConstraintSizes(bool recurse = TRUE);
   virtual bool DoPhase(int nPhase);
+#endif // wxUSE_CONSTRAINTS
 
 protected:
   // common part of all ctors

diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp
index cec5d7ff5299b10fd6a224ab364ff9ab6db84fe3..41bb0705240f6871dd96494f3a8e4523399f6512 100644 (file)
--- a/src/msw/notebook.cpp
+++ b/src/msw/notebook.cpp
@@ -603,6 +603,8 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
 // wxNotebook base class virtuals
 // ----------------------------------------------------------------------------
 
+#if wxUSE_CONSTRAINTS
+
 // override these 2 functions to do nothing: everything is done in OnSize
 
 void wxNotebook::SetConstraintSizes(bool WXUNUSED(recurse))
@@ -616,6 +618,8 @@ bool wxNotebook::DoPhase(int WXUNUSED(nPhase))
   return TRUE;
 }
 
+#endif // wxUSE_CONSTRAINTS
+
 // ----------------------------------------------------------------------------
 // wxNotebook Windows message handlers
 // ----------------------------------------------------------------------------