X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/193d0c93106d21067107c262874763d4c0921707..e93523680ba3c83cdae75b511214c82f28a2d853:/src/msw/textctrl.cpp diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp index 04cc73d26a..567a889620 100644 --- a/src/msw/textctrl.cpp +++ b/src/msw/textctrl.cpp @@ -446,7 +446,7 @@ bool wxTextCtrl::MSWCreateText(const wxString& value, valueWin = value; } - if ( !MSWCreateControl(windowClass, msStyle, pos, size, valueWin) ) + if ( !MSWCreateControl(windowClass.wx_str(), msStyle, pos, size, valueWin) ) return false; #if wxUSE_RICHEDIT @@ -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