X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ef5c70f96f5e06e1c8f8119f51b99dd019583d2b..3d777efedc1e05bd6c2a7c34a00a65895b62bb13:/include/wx/gtk/checkbox.h?ds=sidebyside

diff --git a/include/wx/gtk/checkbox.h b/include/wx/gtk/checkbox.h
index c4639026ff..69985fc457 100644
--- a/include/wx/gtk/checkbox.h
+++ b/include/wx/gtk/checkbox.h
@@ -2,13 +2,12 @@
 // Name:        wx/gtk/checkbox.h
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __GTKCHECKBOXH__
-#define __GTKCHECKBOXH__
+#ifndef _WX_GTKCHECKBOX_H_
+#define _WX_GTKCHECKBOX_H_
 
 // ----------------------------------------------------------------------------
 // wxCheckBox
@@ -18,6 +17,7 @@ class WXDLLIMPEXP_CORE wxCheckBox : public wxCheckBoxBase
 {
 public:
     wxCheckBox();
+    ~wxCheckBox();
     wxCheckBox( wxWindow *parent, wxWindowID id, const wxString& label,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize, long style = 0,
@@ -39,21 +39,16 @@ public:
     bool GetValue() const;
 
     virtual void SetLabel( const wxString& label );
-    virtual bool Enable( bool enable = TRUE );
+    virtual bool Enable( bool enable = true );
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     // implementation
-    // --------------
-
-    GtkWidget *m_widgetCheckbox;
-    GtkWidget *m_widgetLabel;
-
-    bool       m_blockEvent;
+    void GTKDisableEvents();
+    void GTKEnableEvents();
 
 protected:
-    virtual wxSize DoGetBestSize() const;
     virtual void DoApplyWidgetStyle(GtkRcStyle *style);
     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
 
@@ -61,7 +56,12 @@ protected:
     wxCheckBoxState DoGet3StateValue() const;
 
 private:
+    typedef wxCheckBoxBase base_type;
+
+    GtkWidget *m_widgetCheckbox;
+    GtkWidget *m_widgetLabel;
+
     DECLARE_DYNAMIC_CLASS(wxCheckBox)
 };
 
-#endif // __GTKCHECKBOXH__
+#endif // _WX_GTKCHECKBOX_H_