X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9d1b7527cd9713a521912045a3bd2bddbc31d841..4f450f41a2c02db9c35e3e566b381c85b5714de8:/src/msw/bmpbuttn.cpp

diff --git a/src/msw/bmpbuttn.cpp b/src/msw/bmpbuttn.cpp
index be094dd3c5..b82972500e 100644
--- a/src/msw/bmpbuttn.cpp
+++ b/src/msw/bmpbuttn.cpp
@@ -23,10 +23,10 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/dcmemory.h"
+    #include "wx/image.h"
 #endif
 
 #include "wx/msw/private.h"
-#include "wx/image.h"
 
 #include "wx/msw/uxtheme.h"
 
@@ -592,6 +592,11 @@ wxSize wxBitmapButton::DoGetBestSize() const
 {
     if ( m_bmpNormal.Ok() )
     {
+        int width = m_bmpNormal.GetWidth(),
+            height = m_bmpNormal.GetHeight();
+        int marginH = 0,
+            marginV = 0;
+
 #if wxUSE_UXTHEME
         if ( wxUxThemeEngine::GetIfActive() )
         {
@@ -605,17 +610,32 @@ wxSize wxBitmapButton::DoGetBestSize() const
 
             // XP doesn't draw themed buttons correctly when the client area is
             // smaller than 8x8 - enforce this minimum size for small bitmaps
-            wxSize best(wxMax(8, m_bmpNormal.GetWidth()) +
-                            margins.cxLeftWidth + margins.cxRightWidth + 2,
-                        wxMax(8, m_bmpNormal.GetHeight()) +
-                            margins.cyTopHeight + margins.cyBottomHeight + 2);
-            CacheBestSize(best);
-            return best;
+            if ( width < 8 )
+                width = 8;
+            if ( height < 8 )
+                height = 8;
+
+            // don't add margins for the borderless buttons, they don't need
+            // them and it just makes them appear larger than needed
+            if ( !HasFlag(wxBORDER_NONE) )
+            {
+                // we need 2 extra pixels for the focus rectangle, without them
+                // it's overwritten by the bitmap itself
+                marginH = margins.cxLeftWidth + margins.cxRightWidth + 2;
+                marginV = margins.cyTopHeight + margins.cyBottomHeight + 2;
+            }
         }
+        else
 #endif // wxUSE_UXTHEME
+        {
+            if ( !HasFlag(wxBORDER_NONE) )
+            {
+                marginH = 2*m_marginX;
+                marginV = 2*m_marginY;
+            }
+        }
 
-        wxSize best(m_bmpNormal.GetWidth() + 2*m_marginX,
-                      m_bmpNormal.GetHeight() + 2*m_marginY);
+        wxSize best(width + marginH, height + marginV);
         CacheBestSize(best);
         return best;
     }