Set minsize and implement DoGetBestSize

[wxWidgets.git] / src / mac / carbon / slider.cpp

diff --git a/src/mac/carbon/slider.cpp b/src/mac/carbon/slider.cpp
index 3a268fce3e63af27fc4947f58b0f165fb937d401..fb8d6a322aedfbd2f3c015407363d898b152f451 100644 (file)
--- a/src/mac/carbon/slider.cpp
+++ b/src/mac/carbon/slider.cpp
@@ -404,6 +404,7 @@ void wxSlider::DoSetSize(int x, int y, int w, int h, int sizeFlags)
         }
         else
         {
         }
         else
         {

+            w = w - xborder ;

             if ( m_macMinimumStatic )
                 m_macMinimumStatic->Move(GetPosition().x + 0, GetPosition().y + sliderBreadth + wxSLIDER_BORDERTEXT);
             if ( m_macMaximumStatic )
             if ( m_macMinimumStatic )
                 m_macMinimumStatic->Move(GetPosition().x + 0, GetPosition().y + sliderBreadth + wxSLIDER_BORDERTEXT);
             if ( m_macMaximumStatic )


@@ -411,7 +412,6 @@ void wxSlider::DoSetSize(int x, int y, int w, int h, int sizeFlags)
                 GetPosition().y + sliderBreadth + wxSLIDER_BORDERTEXT);
             if ( m_macValueStatic )
                 m_macValueStatic->Move(GetPosition().x + w, GetPosition().y + 0);
                 GetPosition().y + sliderBreadth + wxSLIDER_BORDERTEXT);
             if ( m_macValueStatic )
                 m_macValueStatic->Move(GetPosition().x + w, GetPosition().y + 0);

-            w = w - xborder ;

         }
     }
     //If the control has labels, we still need to call this again because
         }
     }
     //If the control has labels, we still need to call this again because