X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53a2db124c633f80bdb16336084262037d879a2c..d642db66a5efc82d374b813022c72ba88bc50839:/include/wx/univ/button.h diff --git a/include/wx/univ/button.h b/include/wx/univ/button.h index 2aaf0cf4b2..542f9579d6 100644 --- a/include/wx/univ/button.h +++ b/include/wx/univ/button.h @@ -20,10 +20,10 @@ class WXDLLIMPEXP_FWD_CORE wxInputHandler; // the actions supported by this control // ---------------------------------------------------------------------------- -#define wxACTION_BUTTON_TOGGLE _T("toggle") // press/release the button -#define wxACTION_BUTTON_PRESS _T("press") // press the button -#define wxACTION_BUTTON_RELEASE _T("release") // release the button -#define wxACTION_BUTTON_CLICK _T("click") // generate button click event +#define wxACTION_BUTTON_TOGGLE wxT("toggle") // press/release the button +#define wxACTION_BUTTON_PRESS wxT("press") // press the button +#define wxACTION_BUTTON_RELEASE wxT("release") // release the button +#define wxACTION_BUTTON_CLICK wxT("click") // generate button click event // ---------------------------------------------------------------------------- // wxButton: a push button @@ -87,8 +87,6 @@ public: virtual ~wxButton(); - virtual void SetImageLabel(const wxBitmap& bitmap); - virtual void SetImageMargins(wxCoord x, wxCoord y); virtual wxWindow *SetDefault(); virtual bool IsPressed() const { return m_isPressed; } @@ -119,6 +117,9 @@ protected: virtual bool DoDrawBackground(wxDC& dc); virtual void DoDraw(wxControlRenderer *renderer); + virtual void DoSetBitmap(const wxBitmap& bitmap, State which); + virtual void DoSetBitmapMargins(wxCoord x, wxCoord y); + // common part of all ctors void Init();