AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix 10.2 shared unicode builds for mbstowcs and vice versa

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33689 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ryan Norton 2005-04-17 05:19:03 +00:00
parent a77104ea45
commit 1e96e5030c
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/wx/wxchar.h
View File

@ -385,16 +385,19 @@
/* time.h functions */ /* time.h functions */
#define wxAsctime _tasctime #define wxAsctime _tasctime
#define wxCtime _tctime #define wxCtime _tctime
#define wxMbstowcs mbstowcs
#define wxWcstombs wcstombs
#else /* !TCHAR-aware compilers */ #else /* !TCHAR-aware compilers */
#if !defined(__MWERKS__) && defined(__DARWIN__) && ( MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2 ) #if !defined(__MWERKS__) && defined(__DARWIN__) && ( MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2 )
/* even though they are defined and "implemented", they are bad and just /* even though they are defined and "implemented", they are bad and just
stubs so we need our own - we need these even in ANSI builds!! */ stubs so we need our own - we need these even in ANSI builds!! */
#define mbstowcs wxInternalMbstowcs WXDLLIMPEXP_BASE size_t wxMbstowcs (wchar_t *, const char *, size_t);
#define wcstombs wxInternalWcstombs WXDLLIMPEXP_BASE size_t wxWcstombs (char *, const wchar_t *, size_t);
#else
WXDLLIMPEXP_BASE size_t wxInternalMbstowcs (wchar_t *, const char *, size_t); #define wxMbstowcs mbstowcs
WXDLLIMPEXP_BASE size_t wxInternalWcstombs (char *, const wchar_t *, size_t); #define wxWcstombs wcstombs
#endif #endif
/* No UNICODE in the c library except wchar_t typedef on mac OSX 10.2 and less - roll our own */ /* No UNICODE in the c library except wchar_t typedef on mac OSX 10.2 and less - roll our own */

12
src/common/wxchar.cpp
View File

@ -78,14 +78,14 @@ size_t WXDLLEXPORT wxMB2WC(wchar_t *buf, const char *psz, size_t n)
#ifdef HAVE_WCSRTOMBS #ifdef HAVE_WCSRTOMBS
return mbsrtowcs(buf, &psz, n, &mbstate); return mbsrtowcs(buf, &psz, n, &mbstate);
#else #else
return mbstowcs(buf, psz, n); return wxMbstowcs(buf, psz, n);
#endif #endif
} }
#ifdef HAVE_WCSRTOMBS #ifdef HAVE_WCSRTOMBS
return mbsrtowcs((wchar_t *) NULL, &psz, 0, &mbstate); return mbsrtowcs((wchar_t *) NULL, &psz, 0, &mbstate);
#else #else
return mbstowcs((wchar_t *) NULL, psz, 0); return wxMbstowcs((wchar_t *) NULL, psz, 0);
#endif #endif
} }
@ -105,14 +105,14 @@ size_t WXDLLEXPORT wxWC2MB(char *buf, const wchar_t *pwz, size_t n)
#if HAVE_WCSRTOMBS #if HAVE_WCSRTOMBS
return wcsrtombs(buf, &pwz, n, &mbstate); return wcsrtombs(buf, &pwz, n, &mbstate);
#else #else
return wcstombs(buf, pwz, n); return wxWcstombs(buf, pwz, n);
#endif #endif
} }
#if HAVE_WCSRTOMBS #if HAVE_WCSRTOMBS
return wcsrtombs((char *) NULL, &pwz, 0, &mbstate); return wcsrtombs((char *) NULL, &pwz, 0, &mbstate);
#else #else
return wcstombs((char *) NULL, pwz, 0); return wxWcstombs((char *) NULL, pwz, 0);
#endif #endif
} }
#endif // wxUSE_WCHAR_T #endif // wxUSE_WCHAR_T
@ -1072,7 +1072,7 @@ WXDLLEXPORT int wxToupper(wxChar ch) { return (wxChar)CharUpper((LPTSTR)(ch)); }
#if defined(__DARWIN__) && ( MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2 ) #if defined(__DARWIN__) && ( MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2 )
WXDLLEXPORT size_t wxInternalMbstowcs (wchar_t * out, const char * in, size_t outlen) WXDLLEXPORT size_t wxMbstowcs (wchar_t * out, const char * in, size_t outlen)
{ {
if (!out) if (!out)
{ {
@ -1094,7 +1094,7 @@ WXDLLEXPORT size_t wxInternalMbstowcs (wchar_t * out, const char * in, size_t ou
return in - origin; return in - origin;
} }
WXDLLEXPORT size_t wxInternalWcstombs (char * out, const wchar_t * in, size_t outlen) WXDLLEXPORT size_t wxWcstombs (char * out, const wchar_t * in, size_t outlen)
{ {
if (!out) if (!out)
{ {