X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/289532452089421ddadbd4726a8469511a19ab76..a66bf817a6ba833ad47cefc9fa8948ef8045a59d:/src/os2/slider.cpp diff --git a/src/os2/slider.cpp b/src/os2/slider.cpp index 83752dd30b..e74e38ac5e 100644 --- a/src/os2/slider.cpp +++ b/src/os2/slider.cpp @@ -368,7 +368,7 @@ bool wxSlider::Create( ,NULL // no control data ,NULL // no Presentation parameters ); - if (GetFont().Ok()) + if (GetFont().IsOk()) { if (GetFont().GetResourceHandle()) { @@ -881,7 +881,6 @@ int wxSlider::GetValue() const ) ); double dPixelToRange = (double)(nPixelRange - m_nThumbLength)/(double)(m_nRangeMax - m_nRangeMin); - int nNewPos = 0; int nPixelPos = SHORT1FROMMR(::WinSendMsg( GetHwnd() ,SLM_QUERYSLIDERINFO ,MPFROM2SHORT( SMA_SLIDERARMPOSITION @@ -890,7 +889,7 @@ int wxSlider::GetValue() const ,(MPARAM)0 ) ); - nNewPos = (int)(nPixelPos/dPixelToRange); + int nNewPos = (int)(nPixelPos/dPixelToRange); if (nNewPos > (m_nRangeMax - m_nRangeMin)/2) nNewPos++; return nNewPos; @@ -972,7 +971,7 @@ bool wxSlider::OS2OnScroll( int WXUNUSED(nOrientation), vEvent.SetEventObject(this); HandleWindowEvent(vEvent); - wxCommandEvent vCevent( wxEVT_COMMAND_SLIDER_UPDATED, GetId() ); + wxCommandEvent vCevent( wxEVT_SLIDER, GetId() ); vCevent.SetInt(nNewPos); vCevent.SetEventObject(this); @@ -1074,7 +1073,7 @@ void wxSlider::SetTick( } // end of wxSlider::SetTick // For trackbars only -void wxSlider::SetTickFreq( int n, int WXUNUSED(nPos) ) +void wxSlider::DoSetTickFreq( int n ) { SLDCDATA vSlData; WNDPARAMS vWndParams;