X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ff8cb900da92489dd87712e409bfd4c1f5eacfb8..64ea838d8f4d1853b7d850db93ee565e901d099a:/src/osx/combobox_osx.cpp?ds=sidebyside

diff --git a/src/osx/combobox_osx.cpp b/src/osx/combobox_osx.cpp
index 3dc89288ee..00a8e571fe 100644
--- a/src/osx/combobox_osx.cpp
+++ b/src/osx/combobox_osx.cpp
@@ -131,11 +131,13 @@ unsigned int wxComboBox::GetCount() const
 
 void wxComboBox::DoDeleteOneItem(unsigned int n)
 {
+    m_datas.RemoveAt(n);
     GetComboPeer()->RemoveItem(n);
 }
 
 void wxComboBox::DoClear()
 {
+    m_datas.Clear();
     GetComboPeer()->Clear();
 }
 
@@ -189,8 +191,11 @@ wxString wxComboBox::GetStringSelection() const
 
 void wxComboBox::SetString(unsigned int n, const wxString& s)
 {
-    Delete(n);
-    Insert(s, n);
+    // Notice that we shouldn't delete and insert the item in this control
+    // itself as this would also affect the client data which we need to
+    // preserve here.
+    GetComboPeer()->RemoveItem(n);
+    GetComboPeer()->InsertItem(n, s);
     SetValue(s); // changing the item in the list won't update the display item
 }