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

Fix for Unicode conversion.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16440 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2002-08-10 11:24:25 +00:00
parent 9c34dd9dea
commit 24f588af92
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/common/strconv.cpp
View File

@@ -188,23 +188,23 @@ static size_t decode_utf16(const wchar_t* input, wxUint32& output)
size_t wxMBConv::MB2WC(wchar_t *buf, const char *psz, size_t n) const size_t wxMBConv::MB2WC(wchar_t *buf, const char *psz, size_t n) const
{ {
return wxMB2WC(buf, psz, n)+1; return wxMB2WC(buf, psz, n);
} }
size_t wxMBConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const size_t wxMBConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
{ {
return wxWC2MB(buf, psz, n)+1; return wxWC2MB(buf, psz, n);
} }
const wxWCharBuffer wxMBConv::cMB2WC(const char *psz) const const wxWCharBuffer wxMBConv::cMB2WC(const char *psz) const
{ {
if (psz) if (psz)
{ {
size_t nLen = MB2WC((wchar_t *) NULL, psz, 0); size_t nLen = MB2WC((wchar_t *) NULL, psz, 0); // return value excludes /0
if (nLen == (size_t)-1) if (nLen == (size_t)-1)
return wxWCharBuffer((wchar_t *) NULL); return wxWCharBuffer((wchar_t *) NULL);
wxWCharBuffer buf(nLen); wxWCharBuffer buf(nLen); // this allocates nLen1+
MB2WC((wchar_t *)(const wchar_t *) buf, psz, nLen); MB2WC((wchar_t *)(const wchar_t *) buf, psz, nLen+1);
return buf; return buf;
} }
else else
@@ -215,11 +215,11 @@ const wxCharBuffer wxMBConv::cWC2MB(const wchar_t *psz) const
{ {
if (psz) if (psz)
{ {
size_t nLen = WC2MB((char *) NULL, psz, 0); size_t nLen = WC2MB((char *) NULL, psz, 0); // return value excludes /0
if (nLen == (size_t)-1) if (nLen == (size_t)-1)
return wxCharBuffer((char *) NULL); return wxCharBuffer((char *) NULL);
wxCharBuffer buf(nLen); wxCharBuffer buf(nLen); // this allocates nLen+1
WC2MB((char *)(const char *) buf, psz, nLen); WC2MB((char *)(const char *) buf, psz, nLen+1);
return buf; return buf;
} }
else else
@@ -425,6 +425,7 @@ size_t wxMBConvUTF8::WC2MB(char *buf, const wchar_t *psz, size_t n) const
} }
if (buf && (len<n)) *buf = 0; if (buf && (len<n)) *buf = 0;
return len; return len;
} }