For better support of wxValidators, invoke wxValidator::Validate() directly. Also...

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

diff --git a/include/wx/gtk1/checklst.h b/include/wx/gtk1/checklst.h
index 48cb62cf76ddd1099da8f462d9a32a59316cdc57..e96e56a746bf218ad7507663032155141cfa3c7f 100644 (file)
--- a/include/wx/gtk1/checklst.h
+++ b/include/wx/gtk1/checklst.h
@@ -1,8 +1,8 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        checklst.h
+// Name:        wx/gtk1/checklst.h
 // Purpose:     wxCheckListBox class
 // Author:      Robert Roebling
-// Modified by: 
+// Modified by:
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
@@ -11,45 +11,50 @@
 #ifndef __GTKCHECKLISTH__
 #define __GTKCHECKLISTH__
 
-#ifdef __GNUG__
-#pragma interface
-#endif
+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------
 
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/control.h"
-#include "wx/listbox.h"
+// there is no "right" choice of the checkbox indicators, so allow the user to
+// define them himself if he wants
+#ifndef wxCHECKLBOX_CHECKED
+    #define wxCHECKLBOX_CHECKED   wxT('x')
+    #define wxCHECKLBOX_UNCHECKED wxT(' ')
 
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxCheckListBox;
+    #define wxCHECKLBOX_STRING    wxT("[ ] ")
+#endif
 
 //-----------------------------------------------------------------------------
 // wxCheckListBox
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 
-class wxCheckListBox : public wxListBox
+class WXDLLIMPEXP_CORE wxCheckListBox : public wxListBox
 {
-  DECLARE_DYNAMIC_CLASS(wxCheckListBox)
 public:
-
-  wxCheckListBox();
-  wxCheckListBox(wxWindow *parent, wxWindowID id,
-                 const wxPoint& pos = wxDefaultPosition,
-                 const wxSize& size = wxDefaultSize,
-                 int nStrings = 0, 
-                 const wxString choices[] = NULL,
-                 long style = 0,
-                 const wxValidator& validator = wxDefaultValidator,
-                 const wxString& name = wxListBoxNameStr);
-
-  bool IsChecked( int index ) const;
-  void Check( int index, bool check = TRUE );
-
+    wxCheckListBox();
+    wxCheckListBox(wxWindow *parent, wxWindowID id,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize,
+            int nStrings = 0,
+            const wxString *choices = (const wxString *)NULL,
+            long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxListBoxNameStr);
+    wxCheckListBox(wxWindow *parent, wxWindowID id,
+            const wxPoint& pos,
+            const wxSize& size,
+            const wxArrayString& choices,
+            long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxListBoxNameStr);
+
+    bool IsChecked(unsigned int index) const;
+    void Check(unsigned int index, bool check = true);
+
+    int GetItemHeight() const;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxCheckListBox)
 };
 
-#endif 
-        //__GTKCHECKLISTH__
+#endif   //__GTKCHECKLISTH__