use custom class which doesn't redraw everything on resize instead of SysTabCtl32...

[wxWidgets.git] / src / msw / bmpbuttn.cpp

diff --git a/src/msw/bmpbuttn.cpp b/src/msw/bmpbuttn.cpp
index af0014cf671e8f0627c46b0bea3bc240b67e6d11..e1be21611f2270c55b891b3106919f67fcb30a17 100644 (file)
--- a/src/msw/bmpbuttn.cpp
+++ b/src/msw/bmpbuttn.cpp
@@ -492,26 +492,14 @@ void wxBitmapButton::SetDefault()
 
 wxSize wxBitmapButton::DoGetBestSize() const
 {
 
 wxSize wxBitmapButton::DoGetBestSize() const
 {

-    wxSize best;
-    if (m_bmpNormal.Ok())
+    if ( m_bmpNormal.Ok() )

     {
     {

-        best.x = m_bmpNormal.GetWidth() + 2*m_marginX;
-        best.y = m_bmpNormal.GetHeight() + 2*m_marginY;
+        return wxSize(m_bmpNormal.GetWidth() + 2*m_marginX,
+                      m_bmpNormal.GetHeight() + 2*m_marginY);

     }
 
     }
 

-    // all buttons have at least the standard size unless the user explicitly
-    // wants them to be of smaller size and used wxBU_EXACTFIT style when
-    // creating the button
-    if ( !HasFlag(wxBU_EXACTFIT) )
-    {
-        wxSize sz = GetDefaultSize();
-        if ( best.x < sz.x )
-            best.x = sz.x;
-        if ( best.y < sz.y )
-            best.y = sz.y;
-    }
-
-    return best;
+    // no idea what our best size should be, defer to the base class
+    return wxBitmapButtonBase::DoGetBestSize();

 }
 
 #endif // wxUSE_BMPBUTTON
 }
 
 #endif // wxUSE_BMPBUTTON