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

no real changes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16769 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-08-25 17:15:03 +00:00
parent e93e5b0bb6
commit e5cceba0ea
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/common/strconv.cpp
View File

@@ -239,19 +239,16 @@ const wxWCharBuffer wxMBConv::cMB2WC(const char *psz) const
return wxWCharBuffer((wchar_t *) NULL); return wxWCharBuffer((wchar_t *) NULL);
} }
const wxCharBuffer wxMBConv::cWC2MB(const wchar_t *psz) const const wxCharBuffer wxMBConv::cWC2MB(const wchar_t *pwz) const
{ {
if (psz) // return value excludes NUL
{ size_t nLen = pwz ? WC2MB((char *) NULL, pwz, 0) : (size_t)-1;
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(NULL);
wxCharBuffer buf(nLen); // this allocates nLen+1 wxCharBuffer buf(nLen); // this allocates nLen+1
WC2MB((char *)(const char *) buf, psz, nLen+1); WC2MB((char *)(const char *) buf, pwz, nLen+1);
return buf; return buf;
}
else
return wxCharBuffer((char *) NULL);
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------