X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9d522606d0a1dfd22bcdc1a386b3dca01fa985e3..43c42c18d36c703a88b1b7b697bac27fe5608eca:/include/wx/gtk1/tglbtn.h diff --git a/include/wx/gtk1/tglbtn.h b/include/wx/gtk1/tglbtn.h index 7da1777c18..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: Rocketeer license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_GTK_TOGGLEBUTTON_H_ @@ -19,20 +19,14 @@ // classes //----------------------------------------------------------------------------- -class wxToggleButton; -class wxToggleBitmapButton; - -//----------------------------------------------------------------------------- -// global data -//----------------------------------------------------------------------------- - -extern const wxChar *wxCheckBoxNameStr; +class WXDLLIMPEXP_FWD_CORE wxToggleButton; +class WXDLLIMPEXP_FWD_CORE wxToggleBitmapButton; //----------------------------------------------------------------------------- // wxToggleBitmapButton //----------------------------------------------------------------------------- -class 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 @@ -74,7 +69,7 @@ public: wxBitmap m_bitmap; void OnSetBitmap(); - void ApplyWidgetStyle(); + void DoApplyWidgetStyle(GtkRcStyle *style); bool IsOwnGtkWindow(GdkWindow *window); virtual void OnInternalIdle(); @@ -88,7 +83,7 @@ private: // wxToggleButton //----------------------------------------------------------------------------- -class wxToggleButton: public wxControl +class WXDLLIMPEXP_CORE wxToggleButton: public wxControl { public: // construction/destruction @@ -124,11 +119,11 @@ public: static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - + // implementation bool m_blockEvent; - void ApplyWidgetStyle(); + void DoApplyWidgetStyle(GtkRcStyle *style); bool IsOwnGtkWindow(GdkWindow *window); virtual void OnInternalIdle();