Ryan's patch 1467727 , removing the SetValue from SetRange when not needed and some...

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

diff --git a/src/mac/carbon/slider.cpp b/src/mac/carbon/slider.cpp
index e619ada6c769cdbfc16cd852c36a14f8710e1b19..a46467044f45906f6074149b8201e82ae98ed062 100644 (file)
--- a/src/mac/carbon/slider.cpp
+++ b/src/mac/carbon/slider.cpp
@@ -204,7 +204,16 @@ void wxSlider::SetRange(int minValue, int maxValue)
         m_macMaximumStatic->SetLabel( value );
     }
 
         m_macMaximumStatic->SetLabel( value );
     }
 

-    SetValue( m_rangeMin );
+    // If the range is out of bounds, set it to a 
+    // value that is within bounds
+    // RN: Testing reveals OSX does its own 
+    // bounding, perhaps this isn't needed?
+    int currentValue = GetValue();
+
+    if(currentValue < m_rangeMin)
+        SetValue(m_rangeMin);
+    else if(currentValue > m_rangeMax)
+        SetValue(m_rangeMax);

 }
 
 // For trackbars only
 }
 
 // For trackbars only


@@ -294,19 +303,14 @@ void wxSlider::MacHandleControlClick( WXWidget control, wxInt16 controlpart, boo
 
     SetValue( value );
 
 
     SetValue( value );
 

-    wxEventType scrollEvent = wxEVT_NULL;
-
-    scrollEvent = wxEVT_SCROLL_THUMBTRACK;
-
-    wxScrollEvent event(scrollEvent, m_windowId);
-    event.SetPosition(value);
+    wxScrollEvent event( wxEVT_SCROLL_THUMBTRACK, m_windowId );
+    event.SetPosition( value );

     event.SetEventObject( this );
     event.SetEventObject( this );

-    GetEventHandler()->ProcessEvent(event);
+    GetEventHandler()->ProcessEvent( event );

 
     wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, m_windowId );
     cevent.SetInt( value );
     cevent.SetEventObject( this );
 
     wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, m_windowId );
     cevent.SetInt( value );
     cevent.SetEventObject( this );

-

     GetEventHandler()->ProcessEvent( cevent );
 }
 
     GetEventHandler()->ProcessEvent( cevent );
 }
 


@@ -318,14 +322,10 @@ wxInt32 wxSlider::MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF mevent )
 
     SetValue( value ) ;
 
 
     SetValue( value ) ;
 

-    wxEventType scrollEvent = wxEVT_NULL ;
-
-    scrollEvent = wxEVT_SCROLL_THUMBRELEASE;
-
-    wxScrollEvent event(scrollEvent, m_windowId);
-    event.SetPosition(value);
+    wxScrollEvent event( wxEVT_SCROLL_THUMBRELEASE, m_windowId );
+    event.SetPosition( value );

     event.SetEventObject( this );
     event.SetEventObject( this );

-    GetEventHandler()->ProcessEvent(event);
+    GetEventHandler()->ProcessEvent( event );

 
     wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, m_windowId );
     cevent.SetInt( value );
 
     wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, m_windowId );
     cevent.SetInt( value );