removed wxABI_VERSION checks

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

diff --git a/include/wx/gtk1/checklst.h b/include/wx/gtk1/checklst.h
index 7dc24e2716368e255320c5badef7312f224f7104..a1766e7bb626198e0af027f1ac999716ab01ca9d 100644 (file)
--- a/include/wx/gtk1/checklst.h
+++ b/include/wx/gtk1/checklst.h
@@ -11,41 +11,39 @@
 #ifndef __GTKCHECKLISTH__
 #define __GTKCHECKLISTH__
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/control.h"
-#include "wx/listbox.h"
+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------
 
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
+// 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   _T('x')
+    #define wxCHECKLBOX_UNCHECKED _T(' ')
 
-class wxCheckListBox;
+    #define wxCHECKLBOX_STRING    _T("[ ] ")
+#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,
-#if defined(__SUNCC__)
-            const wxString choices[] = NULL,
-#else
-            const wxString choices[] = (const wxString *) NULL,
-#endif
+            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);
@@ -54,7 +52,9 @@ public:
     void Check( int index, bool check = TRUE );
 
     int GetItemHeight() const;
+    
+private:
+    DECLARE_DYNAMIC_CLASS(wxCheckListBox)
 };
 
-#endif
-        //__GTKCHECKLISTH__
+#endif   //__GTKCHECKLISTH__