Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unicode fixes for OS/2

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2005-04-27 01:19:43 +00:00
parent 18ed8e0032
commit 0fba44b410
46 changed files with 243 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/os2/choice.cpp
View File

@@ -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())