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

fix STL build (don't rely on implicit wxString to char* conversions)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46599 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-06-21 21:45:46 +00:00
parent 7b673beff4
commit 414721d003
2 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/msw/textctrl.cpp
View File

@@ -927,7 +927,7 @@ wxTextCtrl::StreamIn(const wxString& value,
#else // !wxUSE_UNICODE_MSLU
wxCSConv conv(encoding);
const size_t len = conv.MB2WC(NULL, value, value.length());
const size_t len = conv.MB2WC(NULL, value.mb_str(), value.length());
#if wxUSE_WCHAR_T
wxWCharBuffer wchBuf(len);
@@ -937,7 +937,7 @@ wxTextCtrl::StreamIn(const wxString& value,
wchar_t *wpc = wchBuf;
#endif
conv.MB2WC(wpc, value, value.length());
conv.MB2WC(wpc, value.mb_str(), value.length());
#endif // wxUSE_UNICODE_MSLU
// finally, stream it in the control