Have wxUniv wxComboBox inherit from wxItemContainer instead of wxComboBoxBase, since...

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

diff --git a/include/wx/checklst.h b/include/wx/checklst.h
index cd0933ca25aafc7d212bb1cdc89d7089719013f0..a96c2ae3da007b45dda415490f641901e1aaa969 100644 (file)
--- a/include/wx/checklst.h
+++ b/include/wx/checklst.h
@@ -12,6 +12,8 @@
 #ifndef _WX_CHECKLST_H_BASE_
 #define _WX_CHECKLST_H_BASE_
 
+#include "wx/defs.h"
+
 #if wxUSE_CHECKLISTBOX
 
 #include "wx/listbox.h"
@@ -20,7 +22,7 @@
 // wxCheckListBox: a listbox whose items may be checked
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxCheckListBoxBase : public
+class WXDLLIMPEXP_CORE wxCheckListBoxBase : public
                                               #ifdef __WXWINCE__
                                                   // keep virtuals synchronised
                                                   wxListBoxBase
@@ -32,10 +34,10 @@ public:
     wxCheckListBoxBase() { }
 
     // check list box specific methods
-    virtual bool IsChecked(size_t item) const = 0;
-    virtual void Check(size_t item, bool check = true) = 0;
+    virtual bool IsChecked(unsigned int item) const = 0;
+    virtual void Check(unsigned int item, bool check = true) = 0;
 
-    DECLARE_NO_COPY_CLASS(wxCheckListBoxBase)
+    wxDECLARE_NO_COPY_CLASS(wxCheckListBoxBase);
 };
 
 #if defined(__WXUNIVERSAL__)
@@ -46,10 +48,12 @@ public:
     #include "wx/msw/checklst.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/checklst.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
     #include "wx/gtk/checklst.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/checklst.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/checklst.h"
+    #include "wx/osx/checklst.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/checklst.h"
 #elif defined(__WXPM__)