Toolbar fixes and weekly catch-up.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16087 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-07-08 18:23:33 +00:00
parent 58c1c0965e
commit 97d74dd295
5 changed files with 65 additions and 17 deletions
--- a/src/os2/button.cpp
+++ b/src/os2/button.cpp
@@ -162,13 +162,19 @@ wxSize wxButton::DoGetBestSize() const
    //
    nHeightButton += nHeightChar/1.5;

-    wxSize                          vSize = GetDefaultSize();
+    if (!HasFlag(wxBU_EXACTFIT))
+    {
+        wxSize                      vSize = GetDefaultSize();

-    if (nWidthButton > vSize.x)
-        vSize.x = nWidthButton;
-    if (nHeightButton > vSize.y)
-        vSize.y = nHeightButton;
-    return vSize;
+        if (nWidthButton > vSize.x)
+            vSize.x = nWidthButton;
+        if (nHeightButton > vSize.y)
+            vSize.y = nHeightButton;
+        return vSize;
+    }
+    return wxSize( nWidthButton
+                  ,nHeightButton
+                 );
 } // end of wxButton::DoGetBestSize

 /* static */