Fixed bug #1163384. Moved the code that handles activating the cell

[wxWidgets.git] / include / wx / msw / bmpbuttn.h

diff --git a/include/wx/msw/bmpbuttn.h b/include/wx/msw/bmpbuttn.h
index f1716a5473286313905d2428233d9b8af72940fa..c7e2113a74afc9db9e9003477beac3e387ce96ff 100644 (file)
--- a/include/wx/msw/bmpbuttn.h
+++ b/include/wx/msw/bmpbuttn.h
@@ -18,6 +18,7 @@
 
 #include "wx/button.h"
 #include "wx/bitmap.h"
 
 #include "wx/button.h"
 #include "wx/bitmap.h"

+#include "wx/brush.h"

 
 #define wxDEFAULT_BUTTON_MARGIN 4
 
 
 #define wxDEFAULT_BUTTON_MARGIN 4
 


@@ -48,6 +49,7 @@ public:
                 const wxString& name = wxButtonNameStr);
 
     // Implementation
                 const wxString& name = wxButtonNameStr);
 
     // Implementation

+    virtual bool SetBackgroundColour(const wxColour& colour);

     virtual void SetDefault();
     virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
     virtual void DrawFace( WXHDC dc, int left, int top, int right, int bottom, bool sel );
     virtual void SetDefault();
     virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
     virtual void DrawFace( WXHDC dc, int left, int top, int right, int bottom, bool sel );


@@ -56,8 +58,16 @@ public:
 
 protected:
     virtual wxSize DoGetBestSize() const;
 
 protected:
     virtual wxSize DoGetBestSize() const;

-    
-private:
+
+    // invalidate m_brushDisabled when system colours change
+    void OnSysColourChanged(wxSysColourChangedEvent& event);
+
+
+    // the brush we use to draw disabled buttons
+    wxBrush m_brushDisabled;
+
+
+    DECLARE_EVENT_TABLE()

     DECLARE_DYNAMIC_CLASS_NO_COPY(wxBitmapButton)
 };
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxBitmapButton)
 };