made wxListbook events more consistent with wxNotebook ones (patch 1001271)

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

diff --git a/include/wx/gtk/checkbox.h b/include/wx/gtk/checkbox.h
index 412b3663b2e0626137086c96f95ad885b9d608b4..bcf031c96e2bcaefeaab84302bb3c0a16bbf1c73 100644 (file)
--- a/include/wx/gtk/checkbox.h
+++ b/include/wx/gtk/checkbox.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        checkbox.h
+// Name:        wx/gtk/checkbox.h

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -10,35 +10,15 @@
 #ifndef __GTKCHECKBOXH__
 #define __GTKCHECKBOXH__
 
 #ifndef __GTKCHECKBOXH__
 #define __GTKCHECKBOXH__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface
 #endif
 
 #pragma interface
 #endif
 

-#include "wx/defs.h"
-
-#if wxUSE_CHECKBOX
-
-#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

 {
 public:
     wxCheckBox();
 {
 public:
     wxCheckBox();


@@ -62,21 +42,34 @@ public:
     void SetValue( bool state );
     bool GetValue() const;
 
     void SetValue( bool state );
     bool GetValue() const;
 

-    void SetLabel( const wxString& label );
-    bool Enable( bool enable );
+    virtual void SetLabel( const wxString& label );
+    virtual bool Enable( bool enable = TRUE );

 
 

+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+    

     // implementation
     // implementation

-    void ApplyWidgetStyle();
+    // --------------
+
+    void DoApplyWidgetStyle(GtkRcStyle *style);

     bool IsOwnGtkWindow( GdkWindow *window );
     void OnInternalIdle();
 
     GtkWidget *m_widgetCheckbox;
     GtkWidget *m_widgetLabel;
     bool IsOwnGtkWindow( GdkWindow *window );
     void OnInternalIdle();
 
     GtkWidget *m_widgetCheckbox;
     GtkWidget *m_widgetLabel;

-    
+
+    bool       m_blockEvent;
+
+protected:
+    virtual wxSize DoGetBestSize() const;
+
+#ifdef __WXGTK20__
+    void DoSet3StateValue(wxCheckBoxState state);
+    wxCheckBoxState DoGet3StateValue() const;
+#endif
+

 private:
     DECLARE_DYNAMIC_CLASS(wxCheckBox)
 };
 
 private:
     DECLARE_DYNAMIC_CLASS(wxCheckBox)
 };
 

-#endif
-

 #endif // __GTKCHECKBOXH__
 #endif // __GTKCHECKBOXH__