X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..9ed8b5a7b2e41ecb07d2dab32bac32eb7b771fd3:/include/wx/msw/bmpbuttn.h?ds=inline diff --git a/include/wx/msw/bmpbuttn.h b/include/wx/msw/bmpbuttn.h index fa4233e801..86ffd452a4 100644 --- a/include/wx/msw/bmpbuttn.h +++ b/include/wx/msw/bmpbuttn.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: bmpbuttn.h +// Name: wx/msw/bmpbuttn.h // Purpose: wxBitmapButton class // Author: Julian Smart // Modified by: @@ -12,20 +12,15 @@ #ifndef _WX_BMPBUTTN_H_ #define _WX_BMPBUTTN_H_ -#ifdef __GNUG__ -#pragma interface "bmpbuttn.h" -#endif - #include "wx/button.h" #include "wx/bitmap.h" +#include "wx/brush.h" -#define wxDEFAULT_BUTTON_MARGIN 4 - -class WXDLLEXPORT wxBitmapButton: public wxBitmapButtonBase +class WXDLLEXPORT wxBitmapButton : public wxBitmapButtonBase { public: - wxBitmapButton() - { m_marginX = m_marginY = wxDEFAULT_BUTTON_MARGIN; } + wxBitmapButton() { } + wxBitmapButton(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap, @@ -47,20 +42,31 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxButtonNameStr); -#if WXWIN_COMPATIBILITY - wxBitmap *GetBitmap() const { return (wxBitmap *) & m_bmp; } -#endif - // Implementation - virtual void SetDefault(); + virtual bool SetBackgroundColour(const wxColour& colour); 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: + // reimplement some base class virtuals + virtual wxSize DoGetBestSize() const; + virtual void OnSetBitmap(); + + // invalidate m_brushDisabled when system colours change + void OnSysColourChanged(wxSysColourChangedEvent& event); + + // change the currently bitmap if we have a hover one + void OnMouseEnterOrLeave(wxMouseEvent& event); + + + // the brush we use to draw disabled buttons + wxBrush m_brushDisabled; + + + DECLARE_EVENT_TABLE() + DECLARE_DYNAMIC_CLASS_NO_COPY(wxBitmapButton) }; -#endif - // _WX_BMPBUTTN_H_ +#endif // _WX_BMPBUTTN_H_