From 96e93f5b8325700896eb6043ffbf5e496b279747 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 21 Jul 2008 02:26:11 +0000 Subject: [PATCH] added FromUTF8Unchecked() for ANSI build too git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54737 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/string.h | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/include/wx/string.h b/include/wx/string.h index 118232f1db..0a72bfe320 100644 --- a/include/wx/string.h +++ b/include/wx/string.h @@ -1328,9 +1328,20 @@ public: { return wxString(wxMBConvUTF8().cMB2WC(utf8)); } static wxString FromUTF8(const char *utf8, size_t len) { - size_t wlen; - wxWCharBuffer buf(wxMBConvUTF8().cMB2WC(utf8, len == npos ? wxNO_LEN : len, &wlen)); - return wxString(buf.data(), wlen); + size_t wlen; + wxWCharBuffer buf(wxMBConvUTF8().cMB2WC(utf8, len == npos ? wxNO_LEN : len, &wlen)); + return wxString(buf.data(), wlen); + } + static wxString FromUTF8Unchecked(const char *utf8, size_t len = npos) + { + size_t wlen; + wxWCharBuffer buf(wxMBConvUTF8().cMB2WC(utf8, + len == npos ? wxNO_LEN : len, + &wlen)); + wxASSERT_MSG( !utf8 || !*utf8 || wlen, + "string must be valid UTF-8" ); + + return wxString(buf.data(), wlen); } const wxCharBuffer utf8_str() const { return wxMBConvUTF8().cWC2MB(wc_str()); } -- 2.45.2