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

fixed compilation with wxUSE_WCHAR_T=0

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-01-19 12:20:21 +00:00
parent 9ee966ecaf
commit 855d6be778
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/msw/textctrl.cpp
View File

@@ -552,9 +552,15 @@ bool wxTextCtrl::StreamIn(const wxString& value,
// next translate to Unicode using this code page // next translate to Unicode using this code page
int len = ::MultiByteToWideChar(codepage, 0, value, -1, NULL, 0); int len = ::MultiByteToWideChar(codepage, 0, value, -1, NULL, 0);
#if wxUSE_WCHAR_T
wxWCharBuffer wchBuf(len); wxWCharBuffer wchBuf(len);
#else
wchar_t *wchBuf = (wchar_t *)malloc((len + 1)*sizeof(wchar_t));
#endif
if ( !::MultiByteToWideChar(codepage, 0, value, -1, if ( !::MultiByteToWideChar(codepage, 0, value, -1,
(wchar_t *)wchBuf.data(), len) ) (wchar_t *)(const wchar_t *)wchBuf, len) )
{ {
wxLogLastError(_T("MultiByteToWideChar")); wxLogLastError(_T("MultiByteToWideChar"));
} }
@@ -576,10 +582,12 @@ bool wxTextCtrl::StreamIn(const wxString& value,
(LPARAM)&eds) || eds.dwError ) (LPARAM)&eds) || eds.dwError )
{ {
wxLogLastError(_T("EM_STREAMIN")); wxLogLastError(_T("EM_STREAMIN"));
return FALSE;
} }
#if !wxUSE_WCHAR_T
free(wchBuf);
#endif // !wxUSE_WCHAR_T
return TRUE; return TRUE;
} }