Warning fix (instead of silencing int->short with typecast, have the same type intern...

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

diff --git a/include/wx/gtk1/checkbox.h b/include/wx/gtk1/checkbox.h
index f883cf78c9821e21f05350f39e4dbc13e4cca325..555a708d26956d024700e6c9173dc4cc92a6fbe4 100644 (file)
--- a/include/wx/gtk1/checkbox.h
+++ b/include/wx/gtk1/checkbox.h
@@ -1,72 +1,71 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        checkbox.h
+// Name:        wx/gtk/checkbox.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef __GTKCHECKBOXH__
 #define __GTKCHECKBOXH__
 
-#ifdef __GNUG__
-#pragma interface
-#endif
+// ----------------------------------------------------------------------------
+// wxCheckBox
+// ----------------------------------------------------------------------------
 
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/control.h"
+class WXDLLIMPEXP_CORE wxCheckBox : public wxCheckBoxBase
+{
+public:
+    wxCheckBox();
+    wxCheckBox( 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)
+    {
+        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 );
 
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
+    void SetValue( bool state );
+    bool GetValue() const;
 
-class wxCheckBox;
+    virtual void SetLabel( const wxString& label );
+    virtual bool Enable( bool enable = TRUE );
 
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+    
+    // implementation
+    // --------------
 
-extern const char *wxCheckBoxNameStr;
+    void DoApplyWidgetStyle(GtkRcStyle *style);
+    bool IsOwnGtkWindow( GdkWindow *window );
+    void OnInternalIdle();
 
-//-----------------------------------------------------------------------------
-// wxCheckBox
-//-----------------------------------------------------------------------------
+    GtkWidget *m_widgetCheckbox;
+    GtkWidget *m_widgetLabel;
 
-class wxCheckBox: public wxControl
-{
-  DECLARE_DYNAMIC_CLASS(wxCheckBox)
+    bool       m_blockEvent;
 
-  public:
+protected:
+    virtual wxSize DoGetBestSize() const;
 
-    wxCheckBox(void);
-    inline wxCheckBox( 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)
-    {
-      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 );
-    void SetValue( bool state );
-    bool GetValue() const;
-    
-    void SetLabel( const wxString& label );
-    void Enable( bool enable );
-    
-  // implementation        
-  
-    void ApplyWidgetStyle();    
+#ifdef __WXGTK20__
+    void DoSet3StateValue(wxCheckBoxState state);
+    wxCheckBoxState DoGet3StateValue() const;
+#endif
 
-    bool   m_blockFirstEvent;
+private:
+    DECLARE_DYNAMIC_CLASS(wxCheckBox)
 };
 
 #endif // __GTKCHECKBOXH__