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

Mods for Wine compilation

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-08-30 20:34:27 +00:00
parent f13b39c0c3
commit 3bce6687f4
30 changed files with 1128 additions and 745 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/strconv.cpp
View File

@@ -779,7 +779,11 @@ public:
size_t MB2WC(wchar_t *buf, const char *psz, size_t n)
{
size_t len =
#ifdef __WXWINE__
MultiByteToWideChar(m_CodePage, 0, psz, -1, (WCHAR*) buf, buf ? n : 0);
#else
MultiByteToWideChar(m_CodePage, 0, psz, -1, buf, buf ? n : 0);
#endif
//VS: returns # of written chars for buf!=NULL and *size*
// needed buffer for buf==NULL
return len ? (buf ? len : len-1) : (size_t)-1;
@@ -787,8 +791,13 @@ public:
size_t WC2MB(char *buf, const wchar_t *psz, size_t n)
{
#ifdef __WXWINE__
size_t len = WideCharToMultiByte(m_CodePage, 0, (const WCHAR*) psz, -1, buf,
buf ? n : 0, NULL, NULL);
#else
size_t len = WideCharToMultiByte(m_CodePage, 0, psz, -1, buf,
buf ? n : 0, NULL, NULL);
#endif
//VS: returns # of written chars for buf!=NULL and *size*
// needed buffer for buf==NULL
return len ? (buf ? len : len-1) : (size_t)-1;