X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d50dbf7c6a8044a4084f6ffc51aa13d4a2c620c4..b7ea712cc26f4289211f4a24e308f40ff6445991:/include/wx/msw/bmpbuttn.h?ds=inline diff --git a/include/wx/msw/bmpbuttn.h b/include/wx/msw/bmpbuttn.h index fed82429c3..93ee168fa7 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_ -#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 - -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, @@ -56,12 +51,23 @@ public: virtual void DrawButtonDisable( WXHDC dc, int left, int top, int right, int bottom, bool with_marg ); 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_