X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/20123d495814b8b8543bf43fbd63aa7ec21e5d78..26dd7154d5b4ab79db3cf4a6dc07c6404e6e14d8:/include/wx/gtk/tglbtn.h?ds=sidebyside diff --git a/include/wx/gtk/tglbtn.h b/include/wx/gtk/tglbtn.h index 8aa5434314..1b7d9d3ed4 100644 --- a/include/wx/gtk/tglbtn.h +++ b/include/wx/gtk/tglbtn.h @@ -19,25 +19,25 @@ // 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_DATA_CORE(const char) wxCheckBoxNameStr[]; //----------------------------------------------------------------------------- -// wxToggleBitmapButton +// wxBitmapToggleButton //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxToggleBitmapButton: public wxControl +class WXDLLIMPEXP_CORE wxBitmapToggleButton: public wxToggleButtonBase { public: // construction/destruction - wxToggleBitmapButton() {} - wxToggleBitmapButton(wxWindow *parent, + wxBitmapToggleButton() {} + wxBitmapToggleButton(wxWindow *parent, wxWindowID id, const wxBitmap& label, const wxPoint& pos = wxDefaultPosition, @@ -63,32 +63,35 @@ 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 GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); // implementation - bool m_blockEvent; wxBitmap m_bitmap; void OnSetBitmap(); - void DoApplyWidgetStyle(GtkRcStyle *style); - bool IsOwnGtkWindow(GdkWindow *window); - virtual void OnInternalIdle(); +protected: + void GTKDisableEvents(); + void GTKEnableEvents(); + virtual wxSize DoGetBestSize() const; + virtual void DoApplyWidgetStyle(GtkRcStyle *style); + virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; private: - DECLARE_DYNAMIC_CLASS(wxToggleBitmapButton) + DECLARE_DYNAMIC_CLASS(wxBitmapToggleButton) }; //----------------------------------------------------------------------------- // wxToggleButton //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxToggleButton: public wxControl +class WXDLLIMPEXP_CORE wxToggleButton: public wxToggleButtonBase { public: // construction/destruction @@ -124,15 +127,14 @@ public: static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - // implementation - bool m_blockEvent; - void DoApplyWidgetStyle(GtkRcStyle *style); - bool IsOwnGtkWindow(GdkWindow *window); +protected: + void GTKDisableEvents(); + void GTKEnableEvents(); - virtual void OnInternalIdle(); virtual wxSize DoGetBestSize() const; + virtual void DoApplyWidgetStyle(GtkRcStyle *style); + virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; private: DECLARE_DYNAMIC_CLASS(wxToggleButton)