X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/20123d495814b8b8543bf43fbd63aa7ec21e5d78..853b6cd0e4699dbec2c600d9d0390bdb53150a5f:/include/wx/gtk1/tglbtn.h?ds=sidebyside diff --git a/include/wx/gtk1/tglbtn.h b/include/wx/gtk1/tglbtn.h index 8aa5434314..708cdd3292 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 @@ -7,7 +7,7 @@ // Created: 08.02.01 // RCS-ID: $Id$ // Copyright: (c) 2000 Johnny C. Norris II -// License: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_GTK_TOGGLEBUTTON_H_ @@ -19,20 +19,14 @@ // classes //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxToggleButton; -class WXDLLIMPEXP_CORE wxToggleBitmapButton; - -//----------------------------------------------------------------------------- -// global data -//----------------------------------------------------------------------------- - -extern WXDLLIMPEXP_CORE const wxChar *wxCheckBoxNameStr; +class WXDLLIMPEXP_FWD_CORE wxToggleButton; +class WXDLLIMPEXP_FWD_CORE wxToggleBitmapButton; //----------------------------------------------------------------------------- // wxToggleBitmapButton //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxToggleBitmapButton: public wxControl +class WXDLLIMPEXP_CORE wxToggleBitmapButton: public wxToggleButtonBase { public: // construction/destruction @@ -63,7 +57,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 +119,7 @@ public: static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - + // implementation bool m_blockEvent;