X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/20123d495814b8b8543bf43fbd63aa7ec21e5d78..7051fa4161e11e94d6b136ead5ea98fa4624fff5:/include/wx/gtk1/tglbtn.h diff --git a/include/wx/gtk1/tglbtn.h b/include/wx/gtk1/tglbtn.h index 8aa5434314..bd8c465f66 100644 --- a/include/wx/gtk1/tglbtn.h +++ b/include/wx/gtk1/tglbtn.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/tglbtn.h +// Name: wx/gtk1/tglbtn.h // Purpose: Declaration of the wxToggleButton class, which implements a // toggle button under wxGTK. // Author: John Norris, minor changes by Axel Schlueter @@ -19,20 +19,20 @@ // classes //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxToggleButton; -class WXDLLIMPEXP_CORE wxToggleBitmapButton; +class WXDLLIMPEXP_FWD_CORE wxToggleButton; +class WXDLLIMPEXP_FWD_CORE wxToggleBitmapButton; //----------------------------------------------------------------------------- // global data //----------------------------------------------------------------------------- -extern WXDLLIMPEXP_CORE const wxChar *wxCheckBoxNameStr; +extern WXDLLIMPEXP_CORE const char wxCheckBoxNameStr[]; //----------------------------------------------------------------------------- // wxToggleBitmapButton //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxToggleBitmapButton: public wxControl +class WXDLLIMPEXP_CORE wxToggleBitmapButton: public wxToggleButtonBase { public: // construction/destruction @@ -63,7 +63,8 @@ public: bool GetValue() const; // Set the label - void SetLabel(const wxBitmap& label); + virtual void SetLabel(const wxString& label) { wxControl::SetLabel(label); } + virtual void SetLabel(const wxBitmap& label); bool Enable(bool enable = TRUE); static wxVisualAttributes @@ -124,7 +125,7 @@ public: static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - + // implementation bool m_blockEvent;