From: Kevin Ollivier <kevino@theolliviers.com>
Date: Sun, 18 Jul 2004 19:13:50 +0000 (+0000)
Subject: Correct slider width when labels are used.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/fdc2232aba8a1d295e68f075ecfeb5cbef30ac38

Correct slider width when labels are used.


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

diff --git a/src/mac/carbon/slider.cpp b/src/mac/carbon/slider.cpp
index fb8d6a322a..3a268fce3e 100644
--- a/src/mac/carbon/slider.cpp
+++ b/src/mac/carbon/slider.cpp
@@ -404,7 +404,6 @@ void wxSlider::DoSetSize(int x, int y, int w, int h, int sizeFlags)
         }
         else
         {
-            w = w - xborder ;
             if ( m_macMinimumStatic )
                 m_macMinimumStatic->Move(GetPosition().x + 0, GetPosition().y + sliderBreadth + wxSLIDER_BORDERTEXT);
             if ( m_macMaximumStatic )
@@ -412,6 +411,7 @@ 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);
+            w = w - xborder ;
         }
     }
     //If the control has labels, we still need to call this again because