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

fixed wxCSConv to work again for iso-8859-1

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43941 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2006-12-11 21:14:48 +00:00
parent 9b4c231467
commit 2c74c55876
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/common/strconv.cpp
View File

@ -3523,8 +3523,11 @@ size_t wxCSConv::ToWChar(wchar_t *dst, size_t dstLen,
{
CreateConvIfNeeded();
return m_convReal ? m_convReal->ToWChar(dst, dstLen, src, srcLen)
: wxCONV_FAILED;
if (m_convReal)
return m_convReal->ToWChar(dst, dstLen, src, srcLen);
// latin-1 (direct)
return wxMBConv::ToWChar(dst, dstLen, src, srcLen);
}
size_t wxCSConv::FromWChar(char *dst, size_t dstLen,
@ -3532,8 +3535,11 @@ size_t wxCSConv::FromWChar(char *dst, size_t dstLen,
{
CreateConvIfNeeded();
return m_convReal ? m_convReal->FromWChar(dst, dstLen, src, srcLen)
: wxCONV_FAILED;
if (m_convReal)
return m_convReal->FromWChar(dst, dstLen, src, srcLen);
// latin-1 (direct)
return wxMBConv::FromWChar(dst, dstLen, src, srcLen);
}
size_t wxCSConv::MB2WC(wchar_t *buf, const char *psz, size_t n) const