Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/checklst.h b/include/wx/checklst.h
index f976b0c1f4da787d394ca550c0faeb13b369d432..80f08b37ec4c5e4cb6e80ae224d1645408efd34c 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_
 
 #ifndef _WX_CHECKLST_H_BASE_
 #define _WX_CHECKLST_H_BASE_
 

+#include "wx/defs.h"
+

 #if wxUSE_CHECKLISTBOX
 
 #include "wx/listbox.h"
 #if wxUSE_CHECKLISTBOX
 
 #include "wx/listbox.h"


@@ -20,7 +22,7 @@
 // wxCheckListBox: a listbox whose items may be checked
 // ----------------------------------------------------------------------------
 
 // wxCheckListBox: a listbox whose items may be checked
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxCheckListBoxBase : public
+class WXDLLIMPEXP_CORE wxCheckListBoxBase : public

                                               #ifdef __WXWINCE__
                                                   // keep virtuals synchronised
                                                   wxListBoxBase
                                               #ifdef __WXWINCE__
                                                   // keep virtuals synchronised
                                                   wxListBoxBase


@@ -32,10 +34,12 @@ public:
     wxCheckListBoxBase() { }
 
     // check list box specific methods
     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;
+
+    virtual unsigned int GetCheckedItems(wxArrayInt& checkedItems) const;

 
 

-    DECLARE_NO_COPY_CLASS(wxCheckListBoxBase)
+    wxDECLARE_NO_COPY_CLASS(wxCheckListBoxBase);

 };
 
 #if defined(__WXUNIVERSAL__)
 };
 
 #if defined(__WXUNIVERSAL__)


@@ -51,7 +55,7 @@ public:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/checklst.h"
 #elif defined(__WXMAC__)
 #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__)
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/checklst.h"
 #elif defined(__WXPM__)