X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..dbc74bccc9d020281f2e1fcceb35323d45c91566:/src/os2/spinbutt.cpp?ds=inline diff --git a/src/os2/spinbutt.cpp b/src/os2/spinbutt.cpp index 3c6aee6eef..0c25a24f01 100644 --- a/src/os2/spinbutt.cpp +++ b/src/os2/spinbutt.cpp @@ -6,14 +6,9 @@ // Created: 10/15/99 // RCS-ID: $Id$ // Copyright: (c) David Webster -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ - #pragma implementation "spinbutt.h" - #pragma implementation "spinbutbase.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -32,7 +27,6 @@ extern void wxAssociateWinWithHandle( HWND hWnd ,wxWindowOS2* pWin ); -static WXFARPROC fnWndProcSpinCtrl = (WXFARPROC)NULL; IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent) @@ -123,7 +117,7 @@ bool wxSpinButton::Create( ::WinQueryWindowPos(m_hWnd, &vSwp); SetXComp(vSwp.x); - SetYComp(vSwp.y); + SetYComp(vSwp.y-5); // compensate for the associated TextControl border wxFont* pTextFont = new wxFont( 10 ,wxMODERN ,wxNORMAL @@ -132,11 +126,12 @@ bool wxSpinButton::Create( SetFont(*pTextFont); // // For OS/2 we want to hide the text portion so we can substitute an - // independent text ctrl in its place. 10 device units does this + // independent text ctrl in its place. + // Therefore we must override any user given width with our best guess. // - SetSize( nX - ,nY - ,10L + SetSize( nX - GetXComp() + ,nY - GetYComp() + ,nWidth ,nHeight ); wxAssociateWinWithHandle( m_hWnd @@ -165,10 +160,11 @@ wxSize wxSpinButton::DoGetBestSize() const { // // OS/2 PM does not really have system metrics so we'll just set it to - // 24x20 which is the size of the buttons and the borders. + // 26x20 which is the size of the buttons and the borders. // Also we have no horizontal spin buttons. // - return (wxSize(24,20)); + wxSize best(26,20); + return best; } // end of wxSpinButton::DoGetBestSize // ---------------------------------------------------------------------------- @@ -191,31 +187,25 @@ int wxSpinButton::GetValue() const return ((int)lVal); } // end of wxSpinButton::GetValue -bool wxSpinButton::OS2OnScroll( - int nOrientation -, WXWORD wParam -, WXWORD wPos -, WXHWND hControl -) +bool wxSpinButton::OS2OnScroll( int WXUNUSED(nOrientation), + WXWORD WXUNUSED(wParam), + WXWORD wPos, + WXHWND hControl ) { - wxCHECK_MSG(hControl, FALSE, wxT("scrolling what?") ) + wxCHECK_MSG(hControl, false, wxT("scrolling what?") ); - wxSpinEvent vEvent( wxEVT_SCROLL_THUMBTRACK - ,m_windowId - ); - int nVal = (int)wPos; // cast is important for negative values! + wxSpinEvent vEvent( wxEVT_SCROLL_THUMBTRACK, m_windowId ); + int nVal = (int)wPos; // cast is important for negative values! vEvent.SetPosition(nVal); vEvent.SetEventObject(this); return(GetEventHandler()->ProcessEvent(vEvent)); } // end of wxSpinButton::OS2OnScroll -bool wxSpinButton::OS2Command( - WXUINT uCmd -, WXWORD wId -) +bool wxSpinButton::OS2Command( WXUINT WXUNUSED(uCmd), + WXWORD WXUNUSED(wId) ) { - return FALSE; + return false; } // end of wxSpinButton::OS2Command void wxSpinButton::SetRange(