X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/42782237f24807ddb0bae1c84997e29573f5c2df..ee5aa9d44fa75e88bce9981d7d02dea9f6d5f3c4:/src/os2/spinctrl.cpp diff --git a/src/os2/spinctrl.cpp b/src/os2/spinctrl.cpp index a7da77ea4e..2aeef5f3d7 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 | @@ -171,20 +169,11 @@ bool wxSpinCtrl::Create( wxWindow* pParent, m_hWndBuddy = m_hWnd; // One in the same for OS/2 if(pParent) pParent->AddChild((wxSpinButton *)this); - wxFont* pTextFont = new wxFont( 10 - ,wxMODERN - ,wxNORMAL - ,wxNORMAL - ); - SetFont(*pTextFont); - ::WinQueryWindowPos(m_hWnd, &vSwp); - SetXComp(vSwp.x); - SetYComp(vSwp.y); - SetSize( rPos.x - ,rPos.y - ,rSize.x - ,rSize.y - ); + + SetFont(*wxSMALL_FONT); + SetXComp(0); + SetYComp(0); + SetSize( rPos.x, rPos.y, rSize.x, rSize.y ); SetRange(nMin, nMax); SetValue(nInitial); @@ -198,7 +187,6 @@ bool wxSpinCtrl::Create( wxWindow* pParent, ::WinSetWindowULong(GetHwnd(), QWL_USER, (LONG)this); fnWndProcSpinCtrl = (WXFARPROC)::WinSubclassWindow(m_hWnd, (PFNWP)wxSpinCtrlWndProc); m_svAllSpins.Add(this); - delete pTextFont; return true; } // end of wxSpinCtrl::Create @@ -215,7 +203,7 @@ wxSize wxSpinCtrl::DoGetBestSize() const ,&nHeight ,&vFont ); - nHeight = EDIT_HEIGHT_FROM_CHAR_HEIGHT(nHeight); + nHeight = EDIT_HEIGHT_FROM_CHAR_HEIGHT(nHeight)+4; if (vSizeBtn.y < nHeight) { @@ -232,13 +220,7 @@ void wxSpinCtrl::DoGetPosition( , int* pnY ) const { - WXHWND hWnd = GetHWND(); - - wxConstCast(this, wxSpinCtrl)->m_hWnd = m_hWndBuddy; - wxSpinButton::DoGetPosition( pnX - ,pnY - ); - wxConstCast(this, wxSpinCtrl)->m_hWnd = hWnd; + wxSpinButton::DoGetPosition( pnX,pnY ); } // end of wxpinCtrl::DoGetPosition void wxSpinCtrl::DoGetSize( @@ -474,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