X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8f248607e5557858399a0d13b077a49014df8fbc..7d61c83f406d54aefe0aac9b6de39bdc8f1c295f:/include/wx/cocoa/combobox.h

diff --git a/include/wx/cocoa/combobox.h b/include/wx/cocoa/combobox.h
index d0e7cb6b1a..542626f165 100644
--- a/include/wx/cocoa/combobox.h
+++ b/include/wx/cocoa/combobox.h
@@ -26,8 +26,9 @@ class wxCocoaNSComboBox
 public:
     void AssociateNSComboBox(WX_NSComboBox cocoaNSComboBox);
     void DisassociateNSComboBox(WX_NSComboBox cocoaNSComboBox);
-    
+
     virtual void doWxEvent(int nEvent) = 0;
+    virtual ~wxCocoaNSComboBox() { }
 };
 
 //begin combobox.h
@@ -100,24 +101,28 @@ protected:
 // Implementation
 // ------------------------------------------------------------------------
 public:
+    // FIXME: Quit deriving from wxTextCtrl
+    void Clear() // HACK
+    {   wxComboBoxBase::Clear(); }
+
     // wxCombobox methods
-    virtual void SetSelection(int);
+    virtual void SetSelection(int pos);
     // 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 int FindString(const wxString&) const;
+    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 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(); }