X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53a2db124c633f80bdb16336084262037d879a2c..9869c26285dc51d13607cddaa04f65ce983653a5:/include/wx/msw/bmpbuttn.h diff --git a/include/wx/msw/bmpbuttn.h b/include/wx/msw/bmpbuttn.h index 5d3cab5ce7..e435673c2b 100644 --- a/include/wx/msw/bmpbuttn.h +++ b/include/wx/msw/bmpbuttn.h @@ -4,7 +4,6 @@ // Author: Julian Smart // Modified by: // Created: 01/02/97 -// RCS-ID: $Id$ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -19,7 +18,7 @@ class WXDLLIMPEXP_CORE wxBitmapButton : public wxBitmapButtonBase { public: - wxBitmapButton() { Init(); } + wxBitmapButton() {} wxBitmapButton(wxWindow *parent, wxWindowID id, @@ -30,8 +29,6 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxButtonNameStr) { - Init(); - Create(parent, id, bitmap, pos, size, style, validator, name); } @@ -44,49 +41,7 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxButtonNameStr); - // override some base class methods to automatically synthesize the - // disabled bitmap if it wasn't set by the user - virtual void SetBitmapLabel(const wxBitmap& bitmap); - virtual void SetBitmapFocus(const wxBitmap& focus); - virtual void SetBitmapDisabled(const wxBitmap& disabled); - virtual void SetBitmapHover(const wxBitmap& hover); - - // Implementation - 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 ); - protected: - // common part of all ctors - void Init() - { - m_disabledSetByUser = - m_hoverSetByUser = false; - } - - // reimplement some base class virtuals - virtual wxSize DoGetBestSize() const; - - // 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; - - // true if m_bmpDisabled was set by user, false if we created it ourselves - // from m_bmpNormal - bool m_disabledSetByUser; - - // true if m_bmpHover was set by user, false if it was set from m_bmpFocus - bool m_hoverSetByUser; - - DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS_NO_COPY(wxBitmapButton) };