Removed cacheing option

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

diff --git a/include/wx/gtk1/checkbox.h b/include/wx/gtk1/checkbox.h
index 3737b9eb952b38de45bd2addc37a15420db12e91..001bf3f7738b8664f5bc63dd72917766fb68d481 100644 (file)
--- a/include/wx/gtk1/checkbox.h
+++ b/include/wx/gtk1/checkbox.h
@@ -7,7 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

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


@@ -15,33 +14,14 @@
 #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:
 public:

-    wxCheckBox(void);
+    wxCheckBox();

     wxCheckBox( wxWindow *parent, wxWindowID id, const wxString& label,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize, long style = 0,
     wxCheckBox( wxWindow *parent, wxWindowID id, const wxString& label,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize, long style = 0,


@@ -50,22 +30,36 @@ public:
     {
         Create(parent, id, label, pos, size, style, validator, name);
     }
     {
         Create(parent, id, label, pos, size, style, validator, name);
     }

-    bool Create( wxWindow *parent, wxWindowID id, const wxString& label,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize, long style = 0,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxCheckBoxNameStr );
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxString& label,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = 0,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxCheckBoxNameStr );
+

     void SetValue( bool state );
     bool GetValue() const;
 
     void SetLabel( const wxString& label );
     void SetValue( bool state );
     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();
+
+    GtkWidget *m_widgetCheckbox;
+    GtkWidget *m_widgetLabel;
+
+protected:
+    virtual wxSize DoGetBestSize() const;

 
 

-    bool   m_blockFirstEvent;
+private:
+    DECLARE_DYNAMIC_CLASS(wxCheckBox)

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