X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8787320bbd657237cb887bdfefab969a1b054dd5..16519fd473f79954ba503dfa74a5cc4544391846:/src/os2/spinbutt.cpp?ds=sidebyside diff --git a/src/os2/spinbutt.cpp b/src/os2/spinbutt.cpp index 0bd30bf97c..a7b3237f25 100644 --- a/src/os2/spinbutt.cpp +++ b/src/os2/spinbutt.cpp @@ -9,11 +9,6 @@ // 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,20 +117,17 @@ bool wxSpinButton::Create( ::WinQueryWindowPos(m_hWnd, &vSwp); SetXComp(vSwp.x); - SetYComp(vSwp.y); - wxFont* pTextFont = new wxFont( 10 - ,wxMODERN - ,wxNORMAL - ,wxNORMAL - ); - SetFont(*pTextFont); + SetYComp(vSwp.y-5); // compensate for the associated TextControl border + + SetFont(*wxSMALL_FONT); // // 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 @@ -149,7 +140,6 @@ bool wxSpinButton::Create( ::WinSetWindowULong(GetHwnd(), QWL_USER, (LONG)this); fnWndProcSpinCtrl = (WXFARPROC)::WinSubclassWindow(m_hWnd, (PFNWP)wxSpinCtrlWndProc); #endif - delete pTextFont; return TRUE; } // end of wxSpinButton::Create @@ -164,11 +154,12 @@ wxSpinButton::~wxSpinButton() 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. - // Also we have no horizontal spin buttons. + // OS/2 PM does not really have system metrics so we'll just set it to + // a square based on its height. // - return (wxSize(24,20)); + RECTL vRect; + ::WinQueryWindowRect(GetHwnd(),&vRect); + return wxSize(vRect.yTop,vRect.yTop); } // end of wxSpinButton::DoGetBestSize // ---------------------------------------------------------------------------- @@ -191,31 +182,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)); + return(HandleWindowEvent(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(