removed redundant code

[wxWidgets.git] / include / wx / gtk / checkbox.h

diff --git a/include/wx/gtk/checkbox.h b/include/wx/gtk/checkbox.h
index 41f405680cb8b5a0de2385022e04af29494063a0..0e8cf389b1d858cbabf30a55e5af310b83ed21f7 100644 (file)
--- a/include/wx/gtk/checkbox.h
+++ b/include/wx/gtk/checkbox.h
@@ -7,7 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef __GTKCHECKBOXH__
 #define __GTKCHECKBOXH__
 
 #ifndef __GTKCHECKBOXH__
 #define __GTKCHECKBOXH__
 


@@ -15,31 +14,12 @@
 #pragma interface
 #endif
 
 #pragma interface
 #endif
 

-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/control.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxCheckBox;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern const char *wxCheckBoxNameStr;
-
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 // wxCheckBox
 // wxCheckBox

-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 
 

-class wxCheckBox: public wxControl
+class wxCheckBox : public wxCheckBoxBase

 {
 {

-DECLARE_DYNAMIC_CLASS(wxCheckBox)
-

 public:
     wxCheckBox();
     wxCheckBox( wxWindow *parent, wxWindowID id, const wxString& label,
 public:
     wxCheckBox();
     wxCheckBox( wxWindow *parent, wxWindowID id, const wxString& label,


@@ -63,14 +43,25 @@ public:
     bool GetValue() const;
 
     void SetLabel( const wxString& label );
     bool GetValue() const;
 
     void SetLabel( const wxString& label );

-    void Enable( bool enable );
+    bool Enable( bool enable );

 
     // implementation
 
     // implementation

+    // --------------
+

     void ApplyWidgetStyle();
     void ApplyWidgetStyle();

+    bool IsOwnGtkWindow( GdkWindow *window );
+    void OnInternalIdle();

 
 

-    bool       m_blockFirstEvent;

     GtkWidget *m_widgetCheckbox;
     GtkWidget *m_widgetLabel;
     GtkWidget *m_widgetCheckbox;
     GtkWidget *m_widgetLabel;

+    
+    bool       m_blockEvent;
+
+protected:
+    virtual wxSize DoGetBestSize() const;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxCheckBox)

 };
 
 #endif // __GTKCHECKBOXH__
 };
 
 #endif // __GTKCHECKBOXH__