use To/FromWChar() in single parameter wxMBConv::cMB2WC/WC2MB() overloads too, instea...

[wxWidgets.git] / src / msw / listbox.cpp

diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp
index f85cec4b550f1790616be6f787eea5298cde6446..698d03d610d7001556ed44836bc914521a43a1bd 100644 (file)
--- a/src/msw/listbox.cpp
+++ b/src/msw/listbox.cpp
@@ -279,7 +279,7 @@ void wxListBox::Delete(unsigned int n)
 
 int wxListBox::DoAppend(const wxString& item)
 {
-    int index = ListBox_AddString(GetHwnd(), item);
+    int index = ListBox_AddString(GetHwnd(), item.wx_str());
     m_noItems++;
 
 #if wxUSE_OWNER_DRAWN
@@ -312,7 +312,7 @@ void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)
     unsigned int i;
     for (i = 0; i < m_noItems; i++)
     {
-        ListBox_AddString(GetHwnd(), choices[i]);
+        ListBox_AddString(GetHwnd(), choices[i].wx_str());
         if ( clientData )
         {
             SetClientData(i, clientData[i]);
@@ -349,7 +349,7 @@ int wxListBox::FindString(const wxString& s, bool bCase) const
     if (bCase)
        return wxItemContainerImmutable::FindString( s, bCase );
 
-    int pos = ListBox_FindStringExact(GetHwnd(), -1, s);
+    int pos = ListBox_FindStringExact(GetHwnd(), -1, s.wx_str());
     if (pos == LB_ERR)
         return wxNOT_FOUND;
     else
@@ -520,7 +520,7 @@ wxListBox::DoInsertItems(const wxArrayString& items, unsigned int pos)
     unsigned int nItems = items.GetCount();
     for ( unsigned int i = 0; i < nItems; i++ )
     {
-        int idx = ListBox_InsertString(GetHwnd(), i + pos, items[i]);
+        int idx = ListBox_InsertString(GetHwnd(), i + pos, items[i].wx_str());
 
 #if wxUSE_OWNER_DRAWN
         if ( m_windowStyle & wxLB_OWNERDRAW )
@@ -574,7 +574,7 @@ void wxListBox::SetString(unsigned int n, const wxString& s)
     if ( n == (m_noItems - 1) )
         newN = -1;
 
-    ListBox_InsertString(GetHwnd(), newN, s);
+    ListBox_InsertString(GetHwnd(), newN, s.wx_str());
 
     // restore the client data
     if ( oldData )