honour wxBU_EXACTFIT in wxToggleButton (patch 1567892)

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

diff --git a/docs/changes.txt b/docs/changes.txt
index 98bd418cc1dc4a29ced9d0caf2d62235c9037f3e..b72835a0b57fb0d656e40fab59f044fa4c321363 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -80,6 +80,7 @@ wxMSW:
 - Fixed a bug whereby static controls didn't use the correct text colour if the
   parent's background colour had been set (most noticeable when switching to a
   high-contrast theme).
+- Respect wxBU_EXACTFIT style in wxToggleButton (Alexander Borovsky)
 
 wxMac:
 

diff --git a/src/msw/tglbtn.cpp b/src/msw/tglbtn.cpp
index a0b22727dfb33efebf7097aab18621b95a884f19..906c430116b868ffc6c16c2313b09b020dea3745 100644 (file)
--- a/src/msw/tglbtn.cpp
+++ b/src/msw/tglbtn.cpp
@@ -126,14 +126,18 @@ wxSize wxToggleButton::DoGetBestSize() const
    int hBtn = BUTTON_HEIGHT_FROM_CHAR_HEIGHT(hChar);
 
 #if wxUSE_BUTTON
-   wxSize sz = wxButton::GetDefaultSize();
-   if (wBtn > sz.x)
-       sz.x = wBtn;
-   if (hBtn > sz.y)
-       sz.y = hBtn;
-#else
+   // make all buttons of at least standard size unless wxBU_EXACTFIT is given
+   if ( !HasFlag(wxBU_EXACTFIT) )
+   {
+       const wxSize szMin = wxButton::GetDefaultSize();
+       if ( wBtn < szMin.x )
+           wBtn = szMin.x;
+       if ( hBtn < szMin.y )
+           hBtn = szMin.y;
+   }
+#endif // wxUSE_BUTTON
+
    wxSize sz(wBtn, hBtn);
-#endif
 
    CacheBestSize(sz);
    return sz;