X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/03647350fc7cd141953c72e0284e928847d30f44..d814b237d9485a8698dde38f91325b83982a57e7:/src/osx/slider_osx.cpp

diff --git a/src/osx/slider_osx.cpp b/src/osx/slider_osx.cpp
index cfa7fffc51..ef3a7f1b7d 100644
--- a/src/osx/slider_osx.cpp
+++ b/src/osx/slider_osx.cpp
@@ -4,7 +4,7 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: slider.cpp 54129 2008-06-11 19:30:52Z SC $
+// RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -16,8 +16,6 @@
 #include "wx/slider.h"
 #include "wx/osx/private.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)
-
 BEGIN_EVENT_TABLE(wxSlider, wxControl)
 END_EVENT_TABLE()
 
@@ -166,6 +164,12 @@ void wxSlider::SetValue(int value)
 
 void wxSlider::SetRange(int minValue, int maxValue)
 {
+    // Changing the range preserves the value of the native control but may
+    // change our logical value if we're inverting the native value to get it
+    // as ValueInvertOrNot() depends on the range so preserve it before
+    // changing the range.
+    const int valueOld = GetValue();
+
     wxString value;
 
     m_rangeMin = minValue;
@@ -196,10 +200,13 @@ void wxSlider::SetRange(int minValue, int maxValue)
         SetValue(m_rangeMin);
     else if(currentValue > m_rangeMax)
         SetValue(m_rangeMax);
+
+    // Ensure that our value didn't change.
+    SetValue(valueOld);
 }
 
 // For trackbars only
-void wxSlider::SetTickFreq(int n, int WXUNUSED(pos))
+void wxSlider::DoSetTickFreq(int n)
 {
     // TODO
     m_tickFreq = n;