rewrote wxFileName::Normalize(), added a few methods, general clean up,

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

diff --git a/include/wx/gtk/checkbox.h b/include/wx/gtk/checkbox.h
index d83a8d59ea7062412928eacd8ab79ee40b1b731c..562f783397d99b21a7929aa2bba141f4e4fb59c7 100644 (file)
--- a/include/wx/gtk/checkbox.h
+++ b/include/wx/gtk/checkbox.h
@@ -2,13 +2,11 @@
 // Name:        checkbox.h
 // Purpose:
 // Author:      Robert Roebling
 // Name:        checkbox.h
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-

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


@@ -17,6 +15,9 @@
 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"

+
+#if wxUSE_CHECKBOX
+

 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/control.h"
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/control.h"


@@ -39,30 +40,48 @@ extern const char *wxCheckBoxNameStr;
 
 class wxCheckBox: public wxControl
 {
 
 class wxCheckBox: public wxControl
 {

-  DECLARE_DYNAMIC_CLASS(wxCheckBox)
-
-  public:
-
-    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)
+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);
+        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 SetValue( bool state );
     bool GetValue() const;

-    
+

     void SetLabel( const wxString& label );
     void SetLabel( const wxString& label );

-    void SetFont( const wxFont &font );
-    void Enable( bool enable );
+    bool Enable( bool enable );
+
+    // implementation
+    // --------------
+
+    void ApplyWidgetStyle();
+    bool IsOwnGtkWindow( GdkWindow *window );
+    void OnInternalIdle();
+
+    GtkWidget *m_widgetCheckbox;
+    GtkWidget *m_widgetLabel;
+    
+protected:
+    virtual wxSize DoGetBestSize() const;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxCheckBox)

 };
 
 };
 

+#endif
+

 #endif // __GTKCHECKBOXH__
 #endif // __GTKCHECKBOXH__