Fixed a bug in DoGetBestSize that would make wxSpinCtrl too tall

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25845 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/spinctrl.cpp b/src/msw/spinctrl.cpp
index 88a9e2ec1c844367c0f0c76ee8782e10cdaf9e62..34b9c39b5159aa8c07579b5670ce0b7c34bda79e 100644 (file)
--- a/src/msw/spinctrl.cpp
+++ b/src/msw/spinctrl.cpp
@@ -525,7 +525,12 @@ wxSize wxSpinCtrl::DoGetBestSize() const
     wxGetCharSize(GetHWND(), NULL, &y, &GetFont());
     y = EDIT_HEIGHT_FROM_CHAR_HEIGHT(y);
 
-    if ( sizeBtn.y < y )
+    // JACS: we should always use the height calculated
+    // from above, because otherwise we'll get a spin control
+    // that's too big. So never use the height calculated
+    // from wxSpinButton::DoGetBestSize().
+    
+    // if ( sizeBtn.y < y )
     {
         // make the text tall enough
         sizeBtn.y = y;