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

use wxMBConvStrictUTF8 instead of wxMBConvUTF8 in ConvertStr() and mb/wc_str()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47705 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-07-24 15:10:21 +00:00
parent 0286d08d14
commit 4fdfe2f3ae
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/common/string.cpp
View File

@@ -340,7 +340,7 @@ wxString::SubstrBufFromMB wxString::ConvertStr(const char *psz, size_t nLength,
return SubstrBufFromMB("", 0); return SubstrBufFromMB("", 0);
// and then to UTF-8: // and then to UTF-8:
SubstrBufFromMB buf(ConvertStr(wcBuf, wcLen, wxMBConvUTF8())); SubstrBufFromMB buf(ConvertStr(wcBuf, wcLen, wxMBConvStrictUTF8()));
// widechar -> UTF-8 conversion isn't supposed to ever fail: // widechar -> UTF-8 conversion isn't supposed to ever fail:
wxASSERT_MSG( buf.data, _T("conversion to UTF-8 failed") ); wxASSERT_MSG( buf.data, _T("conversion to UTF-8 failed") );
@@ -382,9 +382,12 @@ const wxCharBuffer wxString::mb_str(const wxMBConv& conv) const
const wxWCharBuffer wxString::wc_str() const const wxWCharBuffer wxString::wc_str() const
{ {
return wxMBConvUTF8().cMB2WC(m_impl.c_str(), return wxMBConvStrictUTF8().cMB2WC
m_impl.length() + 1 /* size, not length */, (
NULL); m_impl.c_str(),
m_impl.length() + 1, // size, not length
NULL
);
} }
const wxCharBuffer wxString::mb_str(const wxMBConv& conv) const const wxCharBuffer wxString::mb_str(const wxMBConv& conv) const
@@ -395,10 +398,12 @@ const wxCharBuffer wxString::mb_str(const wxMBConv& conv) const
// FIXME-UTF8: use wc_str() here once we have buffers with length // FIXME-UTF8: use wc_str() here once we have buffers with length
size_t wcLen; size_t wcLen;
wxWCharBuffer wcBuf( wxWCharBuffer wcBuf(wxMBConvStrictUTF8().cMB2WC
wxMBConvUTF8().cMB2WC(m_impl.c_str(), (
m_impl.length() + 1 /* size, not length */, m_impl.c_str(),
&wcLen)); m_impl.length() + 1, // size
&wcLen
));
if ( !wcLen ) if ( !wcLen )
return wxCharBuffer(""); return wxCharBuffer("");