X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/57bd4c6031d438f11af0ec540136f49a928b923c..7379e47609b16a9fef59e1d2a6b2e47f216dd85c:/src/msw/slider95.cpp diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp index ef18937374..3a0dbfb80e 100644 --- a/src/msw/slider95.cpp +++ b/src/msw/slider95.cpp @@ -364,13 +364,13 @@ bool wxSlider::MSWOnScroll(int WXUNUSED(orientation), wxScrollEvent event(scrollEvent, m_windowId); event.SetPosition(newPos); event.SetEventObject( this ); - GetEventHandler()->ProcessEvent(event); + HandleWindowEvent(event); wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, GetId() ); cevent.SetInt( newPos ); cevent.SetEventObject( this ); - return GetEventHandler()->ProcessEvent( cevent ); + return HandleWindowEvent( cevent ); } void wxSlider::Command (wxCommandEvent & event) @@ -573,7 +573,7 @@ void wxSlider::SetValue(int value) if ( m_labels ) { - ::SetWindowText((*m_labels)[SliderLabel_Value], Format(value)); + ::SetWindowText((*m_labels)[SliderLabel_Value], Format(value).wx_str()); } } @@ -587,8 +587,10 @@ void wxSlider::SetRange(int minValue, int maxValue) if ( m_labels ) { - ::SetWindowText((*m_labels)[SliderLabel_Min], Format(ValueInvertOrNot(m_rangeMin))); - ::SetWindowText((*m_labels)[SliderLabel_Max], Format(ValueInvertOrNot(m_rangeMax))); + ::SetWindowText((*m_labels)[SliderLabel_Min], + Format(ValueInvertOrNot(m_rangeMin)).wx_str()); + ::SetWindowText((*m_labels)[SliderLabel_Max], + Format(ValueInvertOrNot(m_rangeMax)).wx_str()); } }