X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6670f56440ae9209b3e2e51e06acf3bc5aaf1905..6c73e20df7f3a7ea8c2059a816ffd3655ea2b848:/src/os2/spinbutt.cpp diff --git a/src/os2/spinbutt.cpp b/src/os2/spinbutt.cpp index 14ac821f31..0c25a24f01 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" @@ -122,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 @@ -131,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 @@ -164,10 +160,10 @@ 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. // - wxSize best(24,20); + wxSize best(26,20); return best; } // end of wxSpinButton::DoGetBestSize @@ -196,7 +192,7 @@ bool wxSpinButton::OS2OnScroll( int WXUNUSED(nOrientation), 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!