Get SetLabel working again for wxStaticText by overriding SetLabel so that we can...

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

diff --git a/include/wx/msw/wince/checklst.h b/include/wx/msw/wince/checklst.h
index 5cc5ff0fbeed35377326edd0b437e06f0d863e4b..896a30bdad0f4640d2b7681506065babbf6a3af4 100644 (file)
--- a/include/wx/msw/wince/checklst.h
+++ b/include/wx/msw/wince/checklst.h
@@ -12,7 +12,7 @@
 #ifndef   __CHECKLSTCE__H_
 #define   __CHECKLSTCE__H_
 
-class WXDLLEXPORT wxCheckListBox : public wxCheckListBoxBase
+class WXDLLIMPEXP_CORE wxCheckListBox : public wxCheckListBoxBase
 {
 public:
     // ctors
@@ -49,21 +49,19 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxListBoxNameStr);
 
-    // override base class virtuals
-    virtual void Delete(int n);
-
     // items may be checked
-    virtual bool IsChecked(size_t uiIndex) const;
-    virtual void Check(size_t uiIndex, bool bCheck = true);
+    virtual bool IsChecked(unsigned int uiIndex) const;
+    virtual void Check(unsigned int uiIndex, bool bCheck = true);
 
     // public interface derived from wxListBox and lower classes
-    virtual void Clear();
-    virtual size_t GetCount() const;
+    virtual void DoClear();
+    virtual void DoDeleteOneItem(unsigned int n);
+    virtual unsigned int GetCount() const;
     virtual int GetSelection() const;
     virtual int GetSelections(wxArrayInt& aSelections) const;
-    virtual wxString GetString(int n) const;
+    virtual wxString GetString(unsigned int n) const;
     virtual bool IsSelected(int n) const;
-    virtual void SetString(int n, const wxString& s);
+    virtual void SetString(unsigned int n, const wxString& s);
 
     // Implementation
     virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
@@ -72,20 +70,18 @@ protected:
     void OnSize(wxSizeEvent& event);
 
     // protected interface derived from wxListBox and lower classes
-    virtual int DoAppend(const wxString& item);
-    virtual void* DoGetItemClientData(int n) const;
-    virtual wxClientData* DoGetItemClientObject(int n) const;
-    virtual void DoInsertItems(const wxArrayString& items, int pos);
+    virtual int DoInsertItems(const wxArrayStringsAdapter& items,
+                              unsigned int pos,
+                              void **clientData, wxClientDataType type);
+
+    virtual void* DoGetItemClientData(unsigned int n) const;
+    virtual void DoSetItemClientData(unsigned int n, void* clientData);
     virtual void DoSetFirstItem(int n);
-    virtual void DoSetItemClientData(int n, void* clientData);
-    virtual void DoSetItemClientObject(int n, wxClientData* clientData);
-    virtual void DoSetItems(const wxArrayString& items, void **clientData);
     virtual void DoSetSelection(int n, bool select);
     // convert our styles to Windows
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
 private:
-
     wxArrayPtrVoid m_itemsClientData;
 
     DECLARE_EVENT_TABLE()