X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1ab440bc203fc700744039abdcff12bdd6ac6f0a..1d8340b95698d5e27a72bd1aee423a0b954e85b1:/src/os2/slider.cpp diff --git a/src/os2/slider.cpp b/src/os2/slider.cpp index ae0c5c1520..b15c673c1e 100644 --- a/src/os2/slider.cpp +++ b/src/os2/slider.cpp @@ -28,8 +28,6 @@ #include "wx/slider.h" #include "wx/os2/private.h" -IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl) - wxSlider::wxSlider() { m_hStaticValue = 0L; @@ -370,7 +368,7 @@ bool wxSlider::Create( ,NULL // no control data ,NULL // no Presentation parameters ); - if (GetFont().Ok()) + if (GetFont().IsOk()) { if (GetFont().GetResourceHandle()) { @@ -406,11 +404,9 @@ bool wxSlider::Create( ) ) + 4; // for bordersizes - wxColour vColour; - - vColour.Set(wxString(wxT("BLACK"))); + wxColour vColour(*wxBLACK); - LONG lColor = (LONG)vColour.GetPixel(); + LONG lColor = (LONG)vColour.GetPixel(); ::WinSetPresParam( m_hStaticMin ,PP_FOREGROUNDCOLOR @@ -974,13 +970,13 @@ bool wxSlider::OS2OnScroll( int WXUNUSED(nOrientation), vEvent.SetPosition(nNewPos); vEvent.SetEventObject(this); - GetEventHandler()->ProcessEvent(vEvent); + HandleWindowEvent(vEvent); wxCommandEvent vCevent( wxEVT_COMMAND_SLIDER_UPDATED, GetId() ); vCevent.SetInt(nNewPos); vCevent.SetEventObject(this); - return (GetEventHandler()->ProcessEvent(vCevent)); + return (HandleWindowEvent(vCevent)); } // end of wxSlider::OS2OnScroll void wxSlider::SetLineSize( int nLineSize ) @@ -1078,7 +1074,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;