[ 1057587 ] MacOSX build fails with --disable-gauge or --disable-spinbtn

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

diff --git a/src/mac/carbon/gauge.cpp b/src/mac/carbon/gauge.cpp
index 9c7fc023ae166af6e9b882bdf57c7844cee84926..6e9ed032f27f81b6f2784441c3447a22aa29341c 100644 (file)
--- a/src/mac/carbon/gauge.cpp
+++ b/src/mac/carbon/gauge.cpp
@@ -15,6 +15,8 @@
 
 #include "wx/gauge.h"
 
 
 #include "wx/gauge.h"
 

+#if wxUSE_GAUGE 
+

 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
 #endif
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
 #endif


@@ -79,3 +81,5 @@ int wxGauge::GetValue() const
     return m_gaugePos ;
 }
 
     return m_gaugePos ;
 }
 

+#endif // wxUSE_GAUGE 
+

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 8d5f618255fe14bdafed9aa74cb3bd8b13f04816..c7caab3709c42d1c1143f41815e32939dd0dc389 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -1720,10 +1720,12 @@ wxSize wxWindowMac::DoGetBestSize() const
         {
             bestsize.bottom = 16 ;
         }
         {
             bestsize.bottom = 16 ;
         }

+#if wxUSE_SPINBTN 

         else if ( IsKindOf( CLASSINFO( wxSpinButton ) ) )
         {
             bestsize.bottom = 24 ;
         }
         else if ( IsKindOf( CLASSINFO( wxSpinButton ) ) )
         {
             bestsize.bottom = 24 ;
         }

+#endif // wxUSE_SPINBTN 

         else
         {
             // return wxWindowBase::DoGetBestSize() ;
         else
         {
             // return wxWindowBase::DoGetBestSize() ;