X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12028905135250524409f1e7b9bfa9c55e5ce16b..e7c240da70308b5e54bf8bcc9813b5c4e4fece4d:/include/wx/msw/bmpbuttn.h diff --git a/include/wx/msw/bmpbuttn.h b/include/wx/msw/bmpbuttn.h index b879552788..c7e2113a74 100644 --- 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/brush.h" #define wxDEFAULT_BUTTON_MARGIN 4 @@ -47,18 +48,26 @@ 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: +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) };