X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/706fb8932a673a19d7c247d177b49691732b9bd4..86ac84b8ce086e6bbda58f422d41f84268606e35:/include/wx/gtk/tglbtn.h

diff --git a/include/wx/gtk/tglbtn.h b/include/wx/gtk/tglbtn.h
index 3c5bc6c541..1b7d9d3ed4 100644
--- a/include/wx/gtk/tglbtn.h
+++ b/include/wx/gtk/tglbtn.h
@@ -19,25 +19,25 @@
 // classes
 //-----------------------------------------------------------------------------
 
-class wxToggleButton;
-class wxToggleBitmapButton;
+class WXDLLIMPEXP_FWD_CORE wxToggleButton;
+class WXDLLIMPEXP_FWD_CORE wxToggleBitmapButton;
 
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
 
-extern const wxChar *wxCheckBoxNameStr;
+extern WXDLLIMPEXP_DATA_CORE(const char) wxCheckBoxNameStr[];
 
 //-----------------------------------------------------------------------------
-// wxToggleBitmapButton
+// wxBitmapToggleButton
 //-----------------------------------------------------------------------------
 
-class 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 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)