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

fixes for Unicode build with CodeWarrior under OS X 10.2 (patch 1373217)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36776 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-01-08 12:19:14 +00:00
parent 70e51d6918
commit 9452e8789b
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/wx/wxchar.h
View File

@@ -141,9 +141,17 @@
#define wxHAVE_TCHAR_SUPPORT #define wxHAVE_TCHAR_SUPPORT
#endif /* compilers with (good) TCHAR support */ #endif /* compilers with (good) TCHAR support */
#ifdef __MWERKS__ #if defined(__MWERKS__)
/* Metrowerks only has wide char support for OS X >= 10.3 */
#if !defined(__DARWIN__) || \
(MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3)
#define wxHAVE_MWERKS_UNICODE
#endif
#ifdef wxHAVE_MWERKS_UNICODE
#define HAVE_WPRINTF #define HAVE_WPRINTF
#endif #endif
#endif /* __MWERKS__ */
#ifdef wxHAVE_TCHAR_SUPPORT #ifdef wxHAVE_TCHAR_SUPPORT
/* get TCHAR definition if we've got it */ /* get TCHAR definition if we've got it */
@@ -839,14 +847,14 @@ WXDLLIMPEXP_BASE bool wxOKlibc(); /* for internal use */
*/ */
#ifndef wxVsnprintf_ #ifndef wxVsnprintf_
#if wxUSE_UNICODE #if wxUSE_UNICODE
#if defined(__MWERKS__) #ifdef wxHAVE_MWERKS_UNICODE
#define HAVE_WCSRTOMBS 1 #define HAVE_WCSRTOMBS 1
#define HAVE_VSWPRINTF 1 #define HAVE_VSWPRINTF 1
#endif #endif /* Metrowerks with Unicode support */
#if defined(__WATCOMC__) #if defined(__WATCOMC__)
#define wxVsnprintf_ _vsnwprintf #define wxVsnprintf_ _vsnwprintf
#define wxSnprintf_ _snwprintf #define wxSnprintf_ _snwprintf
#endif #endif /* Watcom */
#if defined(HAVE__VSNWPRINTF) #if defined(HAVE__VSNWPRINTF)
#define wxVsnprintf_ _vsnwprintf #define wxVsnprintf_ _vsnwprintf
/* MinGW?MSVCRT has the wrong vswprintf */ /* MinGW?MSVCRT has the wrong vswprintf */