Made wxBU_EXACTFIT work as documented instead of being ignored.

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

diff --git a/src/msw/button.cpp b/src/msw/button.cpp
index cb5cce446f0bd5aa0747f64bbec70536426c8efc..172cf7de5b5e0e0249db6a8abffeeabbe3d8606e 100644 (file)
--- a/src/msw/button.cpp
+++ b/src/msw/button.cpp
@@ -147,11 +147,16 @@ wxSize wxButton::DoGetBestSize() const
     // the button height is proportional to the height of the font used
     int hBtn = BUTTON_HEIGHT_FROM_CHAR_HEIGHT(hChar);
 
     // the button height is proportional to the height of the font used
     int hBtn = BUTTON_HEIGHT_FROM_CHAR_HEIGHT(hChar);
 

-    wxSize sz = GetDefaultSize();
-    if (wBtn > sz.x) sz.x = wBtn;
-    if (hBtn > sz.y) sz.y = hBtn;
+    if (!HasFlag(wxBU_EXACTFIT))
+    {
+        wxSize sz = GetDefaultSize();
+        if (wBtn > sz.x) sz.x = wBtn;
+        if (hBtn > sz.y) sz.y = hBtn;
+        return sz;
+    }
+    else
+        return wxSize(wBtn, hBtn);

 
 

-    return sz;

 }
 
 /* static */
 }
 
 /* static */