compilation fix for wxString::Format("no variadic arguments") and VC6

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

diff --git a/include/wx/checklst.h b/include/wx/checklst.h
index 8e33246ecade3c81e5b241d967479519b4d182e2..d30003320eb22accb1ea99a7709f885978d40a47 100644 (file)
--- a/include/wx/checklst.h
+++ b/include/wx/checklst.h
@@ -20,26 +20,36 @@
 // wxCheckListBox: a listbox whose items may be checked
 // ----------------------------------------------------------------------------
 
 // wxCheckListBox: a listbox whose items may be checked
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxCheckListBoxBase : public wxListBox
+class WXDLLEXPORT wxCheckListBoxBase : public
+                                              #ifdef __WXWINCE__
+                                                  // keep virtuals synchronised
+                                                  wxListBoxBase
+                                              #else
+                                                  wxListBox
+                                              #endif

 {
 public:
     wxCheckListBoxBase() { }
 
     // check list box specific methods
 {
 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)
 };
 
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/checklst.h"
 
     DECLARE_NO_COPY_CLASS(wxCheckListBoxBase)
 };
 
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/checklst.h"

+#elif defined(__WXWINCE__)
+    #include "wx/msw/wince/checklst.h"

 #elif defined(__WXMSW__)
     #include "wx/msw/checklst.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/checklst.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/checklst.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/checklst.h"

-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)

     #include "wx/gtk/checklst.h"
     #include "wx/gtk/checklst.h"

+#elif defined(__WXGTK__)
+    #include "wx/gtk1/checklst.h"

 #elif defined(__WXMAC__)
     #include "wx/mac/checklst.h"
 #elif defined(__WXCOCOA__)
 #elif defined(__WXMAC__)
     #include "wx/mac/checklst.h"
 #elif defined(__WXCOCOA__)