From 06c73b985249b57cfcdb416be98413a5b3559b76 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sat, 5 May 2007 19:19:48 +0000 Subject: [PATCH] fixed FromUTF8 in ANSI builds git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45846 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/string.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/wx/string.h b/include/wx/string.h index 6a47d751a0..3890dd07d1 100644 --- a/include/wx/string.h +++ b/include/wx/string.h @@ -1154,7 +1154,11 @@ public: static wxString FromUTF8(const char *utf8) { return wxString(wxConvUTF8.cMB2WC(utf8)); } static wxString FromUTF8(const char *utf8, size_t len) - { return wxString(wxConvUTF8.cMB2WC(utf8, len == npos ? wxNO_LEN : len)); } + { + size_t wlen; + wxWCharBuffer buf(wxConvUTF8.cMB2WC(utf8, len == npos ? wxNO_LEN : len, &wlen)); + return wxString(buf.data(), wlen); + } const wxCharBuffer utf8_str() const { return wxConvUTF8.cWC2MB(wc_str()); } const wxCharBuffer ToUTF8() const { return utf8_str(); } #endif -- 2.45.2