Patch from Hartwig for wxMac implementation

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

diff --git a/include/wx/mac/carbon/combobox.h b/include/wx/mac/carbon/combobox.h
index f9007107bb32344bc0b5c466e50a8aef142c1545..737f7b4423ed2c424b36098df8115c7779f81da7 100644 (file)
--- a/include/wx/mac/carbon/combobox.h
+++ b/include/wx/mac/carbon/combobox.h
@@ -85,16 +85,15 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
            const wxString& name = wxComboBoxNameStr);
 
     // List functions
-    virtual void Delete(int n);
-    virtual void Clear();
+    virtual void DoDeleteOneItem(unsigned int n);
+    virtual void DoClear();
 
     virtual int GetSelection() const;
-    int GetCurrentSelection() const { return GetSelection(); }
     virtual void SetSelection(int n);
     virtual int FindString(const wxString& s, bool bCase = false) const;
-    virtual wxString GetString(int n) const;
+    virtual wxString GetString(unsigned int n) const;
     virtual wxString GetStringSelection() const;
-    virtual void SetString(int n, const wxString& s);
+    virtual void SetString(unsigned int n, const wxString& s);
 
     // Text field functions
     virtual wxString GetValue() const;
@@ -114,7 +113,7 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
     virtual void SetEditable(bool editable);
     virtual bool IsEditable() const;
 
-    virtual size_t GetCount() const;
+    virtual unsigned int GetCount() const;
 
     virtual void Undo();
     virtual void Redo();
@@ -136,19 +135,16 @@ protected:
     // common part of all ctors
     void Init();
 
-    void FreeData();
-
     // override the base class virtuals involved in geometry calculations
     virtual wxSize DoGetBestSize() const;
     virtual void DoMoveWindow(int x, int y, int width, int height);
 
-    virtual int DoAppend(const wxString& item);
-    virtual int DoInsert(const wxString& item, int pos);
+    virtual int DoInsertItems(const wxArrayStringsAdapter& items,
+                              unsigned int pos,
+                              void **clientData, wxClientDataType type);
 
-    virtual void DoSetItemClientData(int n, void* clientData);
-    virtual void * DoGetItemClientData(int n) const;
-    virtual void DoSetItemClientObject(int n, wxClientData* clientData);
-    virtual wxClientData * DoGetItemClientObject(int n) const;
+    virtual void DoSetItemClientData(unsigned int n, void* clientData);
+    virtual void * DoGetItemClientData(unsigned int n) const;
 
     // the subcontrols
     wxComboBoxText*     m_text;