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 8a7ff239e0646a16a75a33c9b74551cbb6b5504e..e1be21611f2270c55b891b3106919f67fcb30a17 100644 (file)
--- a/src/msw/bmpbuttn.cpp
+++ b/src/msw/bmpbuttn.cpp
@@ -89,6 +89,10 @@ wxCONSTRUCTOR_5( wxBitmapButton , wxWindow* , Parent , wxWindowID , Id , wxBitma
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
 #endif
 
+BEGIN_EVENT_TABLE(wxBitmapButton, wxBitmapButtonBase)
+    EVT_SYS_COLOUR_CHANGED(wxBitmapButton::OnSysColourChanged)
+END_EVENT_TABLE()
+
 /*
 TODO PROPERTIES :
 
@@ -183,6 +187,19 @@ bool wxBitmapButton::SetBackgroundColour(const wxColour& colour)
     return true;
 }
 
+void wxBitmapButton::OnSysColourChanged(wxSysColourChangedEvent& event)
+{
+    m_brushDisabled = wxNullBrush;
+
+    if ( !IsEnabled() )
+    {
+        // this change affects our current state
+        Refresh();
+    }
+
+    event.Skip();
+}
+
 // VZ: should be at the very least less than wxDEFAULT_BUTTON_MARGIN
 #define FOCUS_MARGIN 3
 
@@ -475,26 +492,14 @@ void wxBitmapButton::SetDefault()
 
 wxSize wxBitmapButton::DoGetBestSize() const
 {
-    wxSize best;
-    if (m_bmpNormal.Ok())
-    {
-        best.x = m_bmpNormal.GetWidth() + 2*m_marginX;
-        best.y = 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) )
+    if ( m_bmpNormal.Ok() )
     {
-        wxSize sz = GetDefaultSize();
-        if (best.x > sz.x)
-            sz.x = best.x;
-        if (best.y > sz.y)
-            sz.y = best.y;
+        return wxSize(m_bmpNormal.GetWidth() + 2*m_marginX,
+                      m_bmpNormal.GetHeight() + 2*m_marginY);
     }
 
-    return best;
+    // no idea what our best size should be, defer to the base class
+    return wxBitmapButtonBase::DoGetBestSize();
 }
 
 #endif // wxUSE_BMPBUTTON