X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/61a028dc4af537da90fd52935a75afc9056ecd09..18591d70d9f37ca7af5208c68d4647192b07740d:/src/os2/spinctrl.cpp diff --git a/src/os2/spinctrl.cpp b/src/os2/spinctrl.cpp index a6048ce89c..1777cda78b 100644 --- a/src/os2/spinctrl.cpp +++ b/src/os2/spinctrl.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: os2/spinctrl.cpp +// Name: src/os2/spinctrl.cpp // Purpose: wxSpinCtrl class implementation for OS/2 // Author: David Webster // Modified by: @@ -122,8 +122,6 @@ bool wxSpinCtrl::Create( wxWindow* pParent, int nInitial, const wxString& rsName ) { - SWP vSwp; - if (vId == wxID_ANY) m_windowId = NewControlId(); else @@ -134,7 +132,7 @@ bool wxSpinCtrl::Create( wxWindow* pParent, SetParent(pParent); m_windowStyle = lStyle; - int lSstyle = 0L; + int lSstyle = 0L; lSstyle = WS_VISIBLE | WS_TABSTOP | @@ -175,11 +173,7 @@ bool wxSpinCtrl::Create( wxWindow* pParent, SetFont(*wxSMALL_FONT); SetXComp(0); SetYComp(0); - SetSize( rPos.x - ,rPos.y - ,rSize.x - ,rSize.y - ); + SetSize( rPos.x, rPos.y, rSize.x, rSize.y ); SetRange(nMin, nMax); SetValue(nInitial); @@ -339,7 +333,7 @@ void wxSpinCtrl::OnChar ( InitCommandEvent(vEvent); vEvent.SetString(sVal); vEvent.SetInt(GetValue()); - if (GetEventHandler()->ProcessEvent(vEvent)) + if (HandleWindowEvent(vEvent)) return; break; } @@ -357,7 +351,7 @@ void wxSpinCtrl::OnChar ( vEventNav.SetDirection(!rEvent.ShiftDown()); vEventNav.SetWindowChange(rEvent.ControlDown()); vEventNav.SetEventObject(this); - if (GetParent()->GetEventHandler()->ProcessEvent(vEventNav)) + if (GetParent()->HandleWindowEvent(vEventNav)) return; } break; @@ -379,7 +373,7 @@ void wxSpinCtrl::OnSpinChange( vEvent.SetEventObject(this); vEvent.SetInt(rEventSpin.GetPosition()); - (void)GetEventHandler()->ProcessEvent(vEvent); + (void)HandleWindowEvent(vEvent); if (rEventSpin.GetSkipped()) { vEvent.Skip(); @@ -412,7 +406,7 @@ bool wxSpinCtrl::ProcessTextCommand( WXWORD wCmd, vEvent.SetString(sVal); vEvent.SetInt(GetValue()); - return (GetEventHandler()->ProcessEvent(vEvent)); + return (HandleWindowEvent(vEvent)); } case SPBN_SETFOCUS: @@ -423,7 +417,7 @@ bool wxSpinCtrl::ProcessTextCommand( WXWORD wCmd, ); vEvent.SetEventObject(this); - return(GetEventHandler()->ProcessEvent(vEvent)); + return(HandleWindowEvent(vEvent)); } default: break; @@ -462,7 +456,7 @@ void wxSpinCtrl::SetValue( { long lVal; - lVal = atol((char*)rsText.c_str()); + lVal = atol(rsText.c_str()); wxSpinButton::SetValue(lVal); } // end of wxSpinCtrl::SetValue