fixed wxBU_EXACTFIT handling in wxBitmapButton (closes 1056234)

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

diff --git a/docs/changes.txt b/docs/changes.txt
index 656d436e48010e18ae69633a946cd66fcca47fe3..afc990aefc45aefae6d00a0e561ebe7022909863 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -231,7 +231,8 @@ wxMac:
 wxMSW:
 
 - fixed enhanced metafiles loading from files (Andreas Goebel)
-- Group of wxRadioButtons no longer have to be consecutive
+- wxRadioButtons no longer have to be consecutive in a group
+- fixed wxBU_EXACTFIT handling in wxBitmapButton
 
 
 2.5.3

diff --git a/src/msw/bmpbuttn.cpp b/src/msw/bmpbuttn.cpp
index d40d422eda00b0982cedd213a304a16e114b101a..af0014cf671e8f0627c46b0bea3bc240b67e6d11 100644 (file)
--- a/src/msw/bmpbuttn.cpp
+++ b/src/msw/bmpbuttn.cpp
@@ -505,10 +505,10 @@ wxSize wxBitmapButton::DoGetBestSize() const
     if ( !HasFlag(wxBU_EXACTFIT) )
     {
         wxSize sz = GetDefaultSize();
-        if (best.x > sz.x)
-            sz.x = best.x;
-        if (best.y > sz.y)
-            sz.y = best.y;
+        if ( best.x < sz.x )
+            best.x = sz.x;
+        if ( best.y < sz.y )
+            best.y = sz.y;
     }
 
     return best;