X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4dcccda66bbcf0f68f7d8e069f3fb3ed51d31e68..03773e400b6ff2692f2a9ba045d652c3b7b7109d:/include/wx/gtk/checkbox.h

diff --git a/include/wx/gtk/checkbox.h b/include/wx/gtk/checkbox.h
index bcf031c96e..26db70bcba 100644
--- a/include/wx/gtk/checkbox.h
+++ b/include/wx/gtk/checkbox.h
@@ -7,18 +7,14 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __GTKCHECKBOXH__
-#define __GTKCHECKBOXH__
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
+#ifndef _WX_GTKCHECKBOX_H_
+#define _WX_GTKCHECKBOX_H_
 
 // ----------------------------------------------------------------------------
 // wxCheckBox
 // ----------------------------------------------------------------------------
 
-class wxCheckBox : public wxCheckBoxBase
+class WXDLLIMPEXP_CORE wxCheckBox : public wxCheckBoxBase
 {
 public:
     wxCheckBox();
@@ -43,33 +39,29 @@ 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
-    // --------------
-
-    void DoApplyWidgetStyle(GtkRcStyle *style);
-    bool IsOwnGtkWindow( GdkWindow *window );
-    void OnInternalIdle();
-
-    GtkWidget *m_widgetCheckbox;
-    GtkWidget *m_widgetLabel;
 
-    bool       m_blockEvent;
+    // implementation
+    void GTKDisableEvents();
+    void GTKEnableEvents();
 
 protected:
-    virtual wxSize DoGetBestSize() const;
+    virtual void DoApplyWidgetStyle(GtkRcStyle *style);
+    virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
 
-#ifdef __WXGTK20__
     void DoSet3StateValue(wxCheckBoxState state);
     wxCheckBoxState DoGet3StateValue() const;
-#endif
 
 private:
+    typedef wxCheckBoxBase base_type;
+
+    GtkWidget *m_widgetCheckbox;
+    GtkWidget *m_widgetLabel;
+
     DECLARE_DYNAMIC_CLASS(wxCheckBox)
 };
 
-#endif // __GTKCHECKBOXH__
+#endif // _WX_GTKCHECKBOX_H_