X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5f7bcb48fd9a642036a3bf5c70e2b0c9576df1b1..345319d60c69cac3f5e9e74ee570d20370fc532f:/include/wx/univ/button.h diff --git a/include/wx/univ/button.h b/include/wx/univ/button.h index 68a56beb8e..44fe29ddbf 100644 --- a/include/wx/univ/button.h +++ b/include/wx/univ/button.h @@ -12,10 +12,6 @@ #ifndef _WX_UNIV_BUTTON_H_ #define _WX_UNIV_BUTTON_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "univbutton.h" -#endif - class WXDLLEXPORT wxInputHandler; #include "wx/bitmap.h" @@ -99,22 +95,23 @@ public: virtual bool IsDefault() const { return m_isDefault; } // wxButton actions - void Toggle(); + virtual void Toggle(); virtual void Press(); virtual void Release(); virtual void Click(); -protected: virtual bool PerformAction(const wxControlAction& action, long numArg = -1, const wxString& strArg = wxEmptyString); + + virtual bool CanBeHighlighted() const { return true; } + +protected: virtual wxSize DoGetBestClientSize() const; virtual bool DoDrawBackground(wxDC& dc); virtual void DoDraw(wxControlRenderer *renderer); - virtual bool CanBeHighlighted() const { return true; } - // common part of all ctors void Init();