X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6f02a879ed7efc5fcf6328ff47a1352ec82812b7..d9bd1a73ff69143ddc205d71e1953e8f26fd573d:/include/wx/gtk/tglbtn.h

diff --git a/include/wx/gtk/tglbtn.h b/include/wx/gtk/tglbtn.h
index 0c542ac0c9..583ba88619 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,
@@ -65,33 +65,33 @@ public:
     // Set the label
     virtual void SetLabel(const wxString& label) { wxControl::SetLabel(label); }
     virtual void SetLabel(const wxBitmap& label);
-    bool Enable(bool enable = TRUE);
+    bool Enable(bool enable = true);
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     // implementation
-    bool      m_blockEvent;
     wxBitmap  m_bitmap;
 
     void OnSetBitmap();
-    bool IsOwnGtkWindow(GdkWindow *window);
-
-    virtual void OnInternalIdle();
 
 protected:
-    void DoApplyWidgetStyle(GtkRcStyle *style);
+    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
@@ -123,21 +123,18 @@ public:
 
     // Set the label
     void SetLabel(const wxString& label);
-    bool Enable(bool enable = TRUE);
+    bool Enable(bool enable = true);
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
- 
-    // implementation
-    bool m_blockEvent;
-
-    bool IsOwnGtkWindow(GdkWindow *window);
-
-    virtual void OnInternalIdle();
 
 protected:
-    void DoApplyWidgetStyle(GtkRcStyle *style);
+    void GTKDisableEvents();
+    void GTKEnableEvents();
+
     virtual wxSize DoGetBestSize() const;
+    virtual void DoApplyWidgetStyle(GtkRcStyle *style);
+    virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
 
 private:
     DECLARE_DYNAMIC_CLASS(wxToggleButton)