X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0d598bae33dff0e48eebd569aa3d75e95e8d6947..222702b112dcc7bebe018d6f4d66fe469fefd02c:/src/os2/choice.cpp?ds=sidebyside

diff --git a/src/os2/choice.cpp b/src/os2/choice.cpp
index 9e4e5e1378..7a5cee5085 100644
--- a/src/os2/choice.cpp
+++ b/src/os2/choice.cpp
@@ -216,7 +216,7 @@ int wxChoice::FindString(
         nTextLength = (int)LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYITEMTEXTLENGTH, (MPARAM)nPos, (MPARAM)0));
         zStr = new char[nTextLength + 1];
         ::WinSendMsg(GetHwnd(), LM_QUERYITEMTEXT, MPFROM2SHORT((SHORT)nPos, (SHORT)nTextLength), (MPARAM)zStr);
-        if (rsStr == (char*)zStr)
+        if (rsStr == (wxChar*)zStr)
         {
             delete [] zStr;
             break;
@@ -268,13 +268,13 @@ wxString wxChoice::GetString(
 ) const
 {
     int                             nLen = 0;
-    wxString                        sStr = "";
-    char*                           zBuf;
+    wxString                        sStr = wxEmptyString;
+    wxChar*                         zBuf;
 
     nLen = (size_t)LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYITEMTEXTLENGTH, (MPARAM)n, (MPARAM)0));
     if (nLen != LIT_ERROR && nLen > 0)
     {
-        zBuf = new char[nLen + 1];
+        zBuf = new wxChar[nLen + 1];
         ::WinSendMsg( GetHwnd()
                      ,LM_QUERYITEMTEXT
                      ,MPFROM2SHORT((SHORT)n, (SHORT)nLen)
@@ -436,7 +436,7 @@ bool wxChoice::OS2Command(
 
         vEvent.SetInt(n);
         vEvent.SetEventObject(this);
-        vEvent.SetString((char*)GetStringSelection().c_str());
+        vEvent.SetString(GetStringSelection());
         if (HasClientObjectData())
             vEvent.SetClientObject(GetClientObject(n));
         else if (HasClientUntypedData())