compilation

[wxWidgets.git] / include / wx / cocoa / combobox.h

diff --git a/include/wx/cocoa/combobox.h b/include/wx/cocoa/combobox.h
index 45225f9bc5dea1906dccab0c0e6842faefdccd38..542626f165af9783de9b88a0803f734d15a9093e 100644 (file)
--- a/include/wx/cocoa/combobox.h
+++ b/include/wx/cocoa/combobox.h
@@ -101,24 +101,28 @@ protected:
 // Implementation
 // ------------------------------------------------------------------------
 public:
 // Implementation
 // ------------------------------------------------------------------------
 public:

+    // FIXME: Quit deriving from wxTextCtrl
+    void Clear() // HACK
+    {   wxComboBoxBase::Clear(); }
+

     // wxCombobox methods
     // wxCombobox methods

-    virtual void SetSelection(int);
+    virtual void SetSelection(int pos);

     // Overlapping methods
     virtual wxString GetStringSelection();
     // wxItemContainer
     // Overlapping methods
     virtual wxString GetStringSelection();
     // wxItemContainer

-    virtual void Clear();
-    virtual void Delete(int);
-    virtual int GetCount() const;
-    virtual wxString GetString(int) const;
-    virtual void SetString(int, const wxString&);
+    virtual void DoClear();
+    virtual void DoDeleteOneItem(unsigned int n);
+    virtual unsigned int GetCount() const;
+    virtual wxString GetString(unsigned int) const;
+    virtual void SetString(unsigned int pos, const wxString&);

     virtual int FindString(const wxString& s, bool bCase = false) const;
     virtual int GetSelection() const;
     virtual int FindString(const wxString& s, bool bCase = false) const;
     virtual int GetSelection() const;

-    virtual int DoAppend(const wxString&);
-    virtual int DoInsert(const wxString&, int);
-    virtual void DoSetItemClientData(int, void*);
-    virtual void* DoGetItemClientData(int) const;
-    virtual void DoSetItemClientObject(int, wxClientData*);
-    virtual wxClientData* DoGetItemClientObject(int) const;
+    virtual int DoInsertItems(const wxArrayStringsAdapter& items,
+                              unsigned int pos,
+                              void **clientData, wxClientDataType type);
+    virtual void DoSetItemClientData(unsigned int, void*);
+    virtual void* DoGetItemClientData(unsigned int) const;
+    virtual bool IsSorted() const { return HasFlag(wxCB_SORT); }

     // wxComboBoxBase pure virtuals
     virtual wxString GetValue() const
     {   return wxTextCtrl::GetValue(); }
     // wxComboBoxBase pure virtuals
     virtual wxString GetValue() const
     {   return wxTextCtrl::GetValue(); }