wxChar -> char

[wxWidgets.git] / include / wx / mac / carbon / listbox.h

diff --git a/include/wx/mac/carbon/listbox.h b/include/wx/mac/carbon/listbox.h
index 69e45871ef24096fef21718d6b26ee79223fcec9..9d4800171fcb5b7282fce1c901f87a169679812c 100644 (file)
--- a/include/wx/mac/carbon/listbox.h
+++ b/include/wx/mac/carbon/listbox.h
@@ -89,8 +89,6 @@ public:
 
     // implement base class pure virtuals
     virtual void Refresh(bool eraseBack = true, const wxRect *rect = NULL);
 
     // implement base class pure virtuals
     virtual void Refresh(bool eraseBack = true, const wxRect *rect = NULL);

-    virtual void Clear();
-    virtual void Delete(unsigned int n);

 
     virtual unsigned int GetCount() const;
     virtual wxString GetString(unsigned int n) const;
 
     virtual unsigned int GetCount() const;
     virtual wxString GetString(unsigned int n) const;


@@ -110,17 +108,19 @@ public:
     wxMacListControl* GetPeer() const;
 
 protected:
     wxMacListControl* GetPeer() const;
 
 protected:

+    virtual void DoClear();
+    virtual void DoDeleteOneItem(unsigned int n);
+

     // from wxItemContainer
     // from wxItemContainer

-    virtual int DoAppend(const wxString& item);
+    virtual int DoInsertItems(const wxArrayStringsAdapter& items,
+                              unsigned int pos,
+                              void **clientData, wxClientDataType type);
+

     virtual void DoSetItemClientData(unsigned int n, void* clientData);
     virtual void* DoGetItemClientData(unsigned int n) const;
     virtual void DoSetItemClientData(unsigned int n, void* clientData);
     virtual void* DoGetItemClientData(unsigned int n) const;

-    virtual void DoSetItemClientObject(unsigned int n, wxClientData* clientData);
-    virtual wxClientData* DoGetItemClientObject(unsigned int n) const;

 
     // from wxListBoxBase
     virtual void DoSetSelection(int n, bool select);
 
     // from wxListBoxBase
     virtual void DoSetSelection(int n, bool select);

-    virtual void DoInsertItems(const wxArrayString& items, unsigned int pos);
-    virtual void DoSetItems(const wxArrayString& items, void **clientData);

     virtual void DoSetFirstItem(int n);
     virtual int DoListHitTest(const wxPoint& point) const;
 
     virtual void DoSetFirstItem(int n);
     virtual int DoListHitTest(const wxPoint& point) const;