Add missing WXK constants for the control keys

[wxWidgets.git] / src / osx / combobox_osx.cpp

diff --git a/src/osx/combobox_osx.cpp b/src/osx/combobox_osx.cpp
index 3dc89288eef738433a799689245c74ef3e0cb240..00a8e571fe659f939354c47020c3096c55735317 100644 (file)
--- 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)
 {
 
 void wxComboBox::DoDeleteOneItem(unsigned int n)
 {

+    m_datas.RemoveAt(n);

     GetComboPeer()->RemoveItem(n);
 }
 
 void wxComboBox::DoClear()
 {
     GetComboPeer()->RemoveItem(n);
 }
 
 void wxComboBox::DoClear()
 {

+    m_datas.Clear();

     GetComboPeer()->Clear();
 }
 
     GetComboPeer()->Clear();
 }
 


@@ -189,8 +191,11 @@ wxString wxComboBox::GetStringSelection() const
 
 void wxComboBox::SetString(unsigned int n, const wxString& s)
 {
 
 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
 }
 
     SetValue(s); // changing the item in the list won't update the display item
 }