X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6e348b12dcc7f994da8c2552b80d60140578a745..c4a34cf8c5b5261f8726fdbfe0b2464dd35df268:/src/os2/spinctrl.cpp diff --git a/src/os2/spinctrl.cpp b/src/os2/spinctrl.cpp index d5fb52d270..6fb50893aa 100644 --- a/src/os2/spinctrl.cpp +++ b/src/os2/spinctrl.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: msw/spinctrl.cpp -// Purpose: wxSpinCtrl class implementation for Win32 +// Name: src/os2/spinctrl.cpp +// Purpose: wxSpinCtrl class implementation for OS/2 // Author: David Webster // Modified by: // Created: 10/15/99 @@ -13,12 +13,6 @@ // declarations // ============================================================================ - -#ifdef __GNUG__ - #pragma implementation "spinctrlbase.h" - #pragma implementation "spinctrl.h" -#endif - // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- @@ -31,7 +25,7 @@ #include "wx/wx.h" #endif -#if wxUSE_SPINBTN +#if wxUSE_SPINCTRL #include "wx/spinctrl.h" #include "wx/os2/private.h" @@ -50,7 +44,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl) BEGIN_EVENT_TABLE(wxSpinCtrl, wxSpinButton) EVT_CHAR(wxSpinCtrl::OnChar) - EVT_SPIN(-1, wxSpinCtrl::OnSpinChange) + EVT_SPIN(wxID_ANY, wxSpinCtrl::OnSpinChange) EVT_SET_FOCUS(wxSpinCtrl::OnSetFocus) END_EVENT_TABLE() // ---------------------------------------------------------------------------- @@ -73,8 +67,7 @@ MRESULT EXPENTRY wxSpinCtrlWndProc( wxSpinCtrl* pSpin = (wxSpinCtrl *)::WinQueryWindowULong( hWnd ,QWL_USER ); - bool bProccesed = FALSE; - MRESULT rc = (MRESULT)0; + // // Forward some messages (the key ones only so far) to the spin ctrl // @@ -118,22 +111,18 @@ wxSpinCtrl::~wxSpinCtrl() // construction // ---------------------------------------------------------------------------- -bool wxSpinCtrl::Create( - wxWindow* pParent -, wxWindowID vId -, const wxString& rsValue -, const wxPoint& rPos -, const wxSize& rSize -, long lStyle -, int nMin -, int nMax -, int nInitial -, const wxString& rsName -) +bool wxSpinCtrl::Create( wxWindow* pParent, + wxWindowID vId, + const wxString& WXUNUSED(rsValue), + const wxPoint& rPos, + const wxSize& rSize, + long lStyle, + int nMin, + int nMax, + int nInitial, + const wxString& rsName ) { - SWP vSwp; - - if (vId == -1) + if (vId == wxID_ANY) m_windowId = NewControlId(); else m_windowId = vId; @@ -143,7 +132,7 @@ bool wxSpinCtrl::Create( SetParent(pParent); m_windowStyle = lStyle; - int lSstyle = 0L; + int lSstyle = 0L; lSstyle = WS_VISIBLE | WS_TABSTOP | @@ -175,25 +164,16 @@ bool wxSpinCtrl::Create( ); if (m_hWnd == 0) { - return FALSE; + return false; } 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); @@ -207,23 +187,23 @@ bool wxSpinCtrl::Create( ::WinSetWindowULong(GetHwnd(), QWL_USER, (LONG)this); fnWndProcSpinCtrl = (WXFARPROC)::WinSubclassWindow(m_hWnd, (PFNWP)wxSpinCtrlWndProc); m_svAllSpins.Add(this); - delete pTextFont; - return TRUE; + return true; } // end of wxSpinCtrl::Create wxSize wxSpinCtrl::DoGetBestSize() const { wxSize vSizeBtn = wxSpinButton::DoGetBestSize(); int nHeight; + wxFont vFont = (wxFont)GetFont(); vSizeBtn.x += DEFAULT_ITEM_WIDTH + MARGIN_BETWEEN; wxGetCharSize( GetHWND() ,NULL ,&nHeight - ,(wxFont*)&GetFont() + ,&vFont ); - nHeight = EDIT_HEIGHT_FROM_CHAR_HEIGHT(nHeight); + nHeight = EDIT_HEIGHT_FROM_CHAR_HEIGHT(nHeight)+4; if (vSizeBtn.y < nHeight) { @@ -240,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( @@ -302,10 +276,10 @@ bool wxSpinCtrl::Enable( { if (!wxControl::Enable(bEnable)) { - return FALSE; + return false; } ::WinEnableWindow(GetHwnd(), bEnable); - return TRUE; + return true; } // end of wxSpinCtrl::Enable wxSpinCtrl* wxSpinCtrl::GetSpinForTextCtrl( @@ -347,7 +321,7 @@ void wxSpinCtrl::OnChar ( wxKeyEvent& rEvent ) { - switch (rEvent.KeyCode()) + switch (rEvent.GetKeyCode()) { case WXK_RETURN: { @@ -357,7 +331,7 @@ void wxSpinCtrl::OnChar ( wxString sVal = wxGetWindowText(m_hWndBuddy); InitCommandEvent(vEvent); - vEvent.SetString((char*)sVal.c_str()); + vEvent.SetString(sVal); vEvent.SetInt(GetValue()); if (GetEventHandler()->ProcessEvent(vEvent)) return; @@ -418,23 +392,19 @@ void wxSpinCtrl::OnSetFocus ( rEvent.Skip(); } // end of wxSpinCtrl::OnSetFocus -bool wxSpinCtrl::ProcessTextCommand( - WXWORD wCmd -, WXWORD wId -) +bool wxSpinCtrl::ProcessTextCommand( WXWORD wCmd, + WXWORD WXUNUSED(wId) ) { switch (wCmd) { case SPBN_CHANGE: { - wxCommandEvent vEvent( wxEVT_COMMAND_TEXT_UPDATED - ,GetId() - ); + wxCommandEvent vEvent( wxEVT_COMMAND_TEXT_UPDATED, GetId() ); vEvent.SetEventObject(this); - wxString sVal = wxGetWindowText(m_hWndBuddy); + wxString sVal = wxGetWindowText(m_hWndBuddy); - vEvent.SetString((char*)sVal.c_str()); + vEvent.SetString(sVal); vEvent.SetInt(GetValue()); return (GetEventHandler()->ProcessEvent(vEvent)); } @@ -442,9 +412,9 @@ bool wxSpinCtrl::ProcessTextCommand( case SPBN_SETFOCUS: case SPBN_KILLFOCUS: { - wxFocusEvent vEvent( wCmd == EN_KILLFOCUS ? wxEVT_KILL_FOCUS : wxEVT_SET_FOCUS - ,m_windowId - ); + wxFocusEvent vEvent( wCmd == EN_KILLFOCUS ? wxEVT_KILL_FOCUS : wxEVT_SET_FOCUS + ,m_windowId + ); vEvent.SetEventObject(this); return(GetEventHandler()->ProcessEvent(vEvent)); @@ -456,7 +426,7 @@ bool wxSpinCtrl::ProcessTextCommand( // // Not processed // - return FALSE; + return false; } // end of wxSpinCtrl::ProcessTextCommand void wxSpinCtrl::SetFocus() @@ -471,14 +441,13 @@ bool wxSpinCtrl::SetFont( if (!wxWindowBase::SetFont(rFont)) { // nothing to do - return FALSE; + return false; } - WXHANDLE hFont = GetFont().GetResourceHandle(); wxOS2SetFont( m_hWnd ,rFont ); - return TRUE; + return true; } // end of wxSpinCtrl::SetFont void wxSpinCtrl::SetValue( @@ -487,7 +456,7 @@ void wxSpinCtrl::SetValue( { long lVal; - lVal = atol(rsText.c_str()); + lVal = atol((char*)rsText.c_str()); wxSpinButton::SetValue(lVal); } // end of wxSpinCtrl::SetValue @@ -497,9 +466,9 @@ bool wxSpinCtrl::Show( { if (!wxControl::Show(bShow)) { - return FALSE; + return false; } - return TRUE; + return true; } // end of wxSpinCtrl::Show void wxSpinCtrl::SetSelection ( @@ -508,7 +477,7 @@ void wxSpinCtrl::SetSelection ( ) { // - // If from and to are both -1, it means (in wxWindows) that all text should + // If from and to are both -1, it means (in wxWidgets) that all text should // be selected - translate into Windows convention // if ((lFrom == -1) && (lTo == -1)) @@ -518,4 +487,4 @@ void wxSpinCtrl::SetSelection ( ::WinSendMsg(m_hWnd, EM_SETSEL, MPFROM2SHORT((USHORT)lFrom, (USHORT)lTo), (MPARAM)0); } // end of wxSpinCtrl::SetSelection -#endif //wxUSE_SPINBTN +#endif //wxUSE_SPINCTRL