don't test for things which bakefile already tests for (STRIP, RANLIB, INSTALL, WINDR...

[wxWidgets.git] / src / os2 / spinbutt.cpp

diff --git a/src/os2/spinbutt.cpp b/src/os2/spinbutt.cpp
index 11315a6e1dcff15086bffb0b787a701ffb6b284c..c176baa1419049717574e1ef8a87c3fb69c2fa51 100644 (file)
--- a/src/os2/spinbutt.cpp
+++ b/src/os2/spinbutt.cpp
@@ -118,12 +118,8 @@ bool wxSpinButton::Create(
     ::WinQueryWindowPos(m_hWnd, &vSwp);
     SetXComp(vSwp.x);
     SetYComp(vSwp.y-5); // compensate for the associated TextControl border
     ::WinQueryWindowPos(m_hWnd, &vSwp);
     SetXComp(vSwp.x);
     SetYComp(vSwp.y-5); // compensate for the associated TextControl border

-    wxFont*                          pTextFont = new wxFont( 10
-                                                            ,wxMODERN
-                                                            ,wxNORMAL
-                                                            ,wxNORMAL
-                                                           );
-    SetFont(*pTextFont);
+
+    SetFont(*wxSMALL_FONT);

     //
     // For OS/2 we want to hide the text portion so we can substitute an
     // independent text ctrl in its place.
     //
     // For OS/2 we want to hide the text portion so we can substitute an
     // independent text ctrl in its place.


@@ -144,7 +140,6 @@ bool wxSpinButton::Create(
     ::WinSetWindowULong(GetHwnd(), QWL_USER, (LONG)this);
     fnWndProcSpinCtrl = (WXFARPROC)::WinSubclassWindow(m_hWnd, (PFNWP)wxSpinCtrlWndProc);
 #endif
     ::WinSetWindowULong(GetHwnd(), QWL_USER, (LONG)this);
     fnWndProcSpinCtrl = (WXFARPROC)::WinSubclassWindow(m_hWnd, (PFNWP)wxSpinCtrlWndProc);
 #endif

-    delete pTextFont;

     return TRUE;
 } // end of wxSpinButton::Create
 
     return TRUE;
 } // end of wxSpinButton::Create
 


@@ -159,12 +154,12 @@ wxSpinButton::~wxSpinButton()
 wxSize wxSpinButton::DoGetBestSize() const
 {
     //
 wxSize wxSpinButton::DoGetBestSize() const
 {
     //

-    // OS/2 PM does not really have system metrics so we'll just set  it to
-    // 26x20 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.

     //
     //

-    wxSize best(26,20);
-    return best;
+    RECTL   vRect;
+    ::WinQueryWindowRect(GetHwnd(),&vRect);
+    return wxSize(vRect.yTop,vRect.yTop);

 } // end of wxSpinButton::DoGetBestSize
 
 // ----------------------------------------------------------------------------
 } // end of wxSpinButton::DoGetBestSize
 
 // ----------------------------------------------------------------------------


@@ -192,7 +187,7 @@ bool wxSpinButton::OS2OnScroll( int    WXUNUSED(nOrientation),
                                 WXWORD wPos,
                                 WXHWND hControl )
 {
                                 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!