OS X savvy implementation

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

diff --git a/include/wx/msw/bmpbuttn.h b/include/wx/msw/bmpbuttn.h
index 8551941d1c89d36f9b06b0c8fc4ecc2bde1b80f9..c7e2113a74afc9db9e9003477beac3e387ce96ff 100644 (file)
--- a/include/wx/msw/bmpbuttn.h
+++ b/include/wx/msw/bmpbuttn.h
@@ -12,12 +12,13 @@
 #ifndef _WX_BMPBUTTN_H_
 #define _WX_BMPBUTTN_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "bmpbuttn.h"
 #endif
 
 #include "wx/button.h"
 #include "wx/bitmap.h"
+#include "wx/brush.h"
 
 #define wxDEFAULT_BUTTON_MARGIN 4
 
@@ -47,19 +48,27 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxButtonNameStr);
 
-#if WXWIN_COMPATIBILITY
-    wxBitmap *GetBitmap() const { return (wxBitmap *) &GetBitmapLabel(); }
-#endif
-
     // 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 DrawButtonFocus( WXHDC dc, int left, int top, int right, int bottom, bool sel );
     virtual void DrawButtonDisable( WXHDC dc, int left, int top, int right, int bottom, bool with_marg );
 
-private:
-    DECLARE_DYNAMIC_CLASS(wxBitmapButton)
+protected:
+    virtual wxSize DoGetBestSize() const;
+
+    // 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)
 };
 
 #endif