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

Remove support for MetroWerks CodeWarrior compiler.

Browse Source 
This compiler doesn't exist any more and was probably unsupported even in 2.8,
let alone 2.9, so remove all the __MWERKS__ tests to simplify things.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71102 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-04-05 18:40:11 +00:00
parent db414879d4
commit 2415cf6725
65 changed files with 80 additions and 552 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
include/wx/wxcrtbase.h
View File

@@ -63,7 +63,7 @@
define it ourselves for them
*/
#ifndef isascii
#if defined(__MWERKS__) || defined(__WX_STRICT_ANSI_GCC__)
#if defined(__WX_STRICT_ANSI_GCC__)
#define wxNEED_ISASCII
#elif defined(_WIN32_WCE)
#if _WIN32_WCE <= 211
@@ -84,9 +84,7 @@
/* string.h functions */
#ifndef strdup
#if defined(__MWERKS__) && !defined(__MACH__) && (__MSL__ < 0x00008000)
#define wxNEED_STRDUP
#elif defined(__WXWINCE__)
#if defined(__WXWINCE__)
#if _WIN32_WCE <= 211
#define wxNEED_STRDUP
#endif
@@ -105,21 +103,6 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size );
#endif /* _WIN32_WCE */
#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 1
#define HAVE_WCSRTOMBS 1
#define HAVE_VSWPRINTF 1
#endif
#endif /* __MWERKS__ */
/* -------------------------------------------------------------------------
UTF-8 locale handling
------------------------------------------------------------------------- */
@@ -181,17 +164,14 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size );
#define wxCRT_StrxfrmW wcsxfrm
#endif /* __WXWINCE__ */
/* Almost all compiler have strdup(), but not quite all: CodeWarrior under
Mac and VC++ for Windows CE don't provide it. Another special case is gcc in
strict ANSI mode: normally it doesn't provide strdup() but MinGW does
provide it under MSVC-compatible name so test for it before checking
__WX_STRICT_ANSI_GCC__. */
/* Almost all compiler have strdup(), but VC++ for CE doesn't provide it.
Another special case is gcc in strict ANSI mode: normally it doesn't provide
strdup() but MinGW does provide it under MSVC-compatible name so test for it
before checking __WX_STRICT_ANSI_GCC__. */
#if (defined(__VISUALC__) && __VISUALC__ >= 1400) || \
defined(__MINGW32__)
#define wxCRT_StrdupA _strdup
#elif !((defined(__MWERKS__) && defined(__WXMAC__)) || \
defined(__WXWINCE__) || \
defined(__WX_STRICT_ANSI_GCC__))
#elif !(defined(__WXWINCE__) || defined(__WX_STRICT_ANSI_GCC__))
#define wxCRT_StrdupA strdup
#endif
@@ -268,8 +248,7 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size );
defined(__EMX__) || defined(__DJGPP__)
#define wxCRT_StricmpA stricmp
#define wxCRT_StrnicmpA strnicmp
#elif defined(__SYMANTEC__) || defined(__VISUALC__) || \
(defined(__MWERKS__) && defined(__INTEL__))
#elif defined(__SYMANTEC__) || defined(__VISUALC__)
#define wxCRT_StricmpA _stricmp
#define wxCRT_StrnicmpA _strnicmp
#elif defined(__UNIX__) || (defined(__GNUWIN32__) && !defined(__WX_STRICT_ANSI_GCC__))
@@ -574,14 +553,7 @@ WXDLLIMPEXP_BASE wchar_t * wxCRT_GetenvW(const wchar_t *name);
#define wxCRT_AtoiA atoi
#define wxCRT_AtolA atol
#if defined(__MWERKS__)
#if defined(__MSL__)
#define wxCRT_AtofW watof
#define wxCRT_AtoiW watoi
#define wxCRT_AtolW watol
/* else: use ANSI versions */
#endif
#elif defined(wxHAVE_TCHAR_SUPPORT) && !defined(__WX_STRICT_ANSI_GCC__)
#if defined(wxHAVE_TCHAR_SUPPORT) && !defined(__WX_STRICT_ANSI_GCC__)
#define wxCRT_AtoiW _wtoi
#define wxCRT_AtolW _wtol
/* _wtof doesn't exist */
@@ -593,21 +565,6 @@ WXDLLIMPEXP_BASE wchar_t * wxCRT_GetenvW(const wchar_t *name);
/* wcstoi doesn't exist */
#endif
/*
There are 2 unrelated problems with these functions under Mac:
a) Metrowerks MSL CRT implements them strictly in C99 sense and
doesn't support (very common) extension of allowing to call
mbstowcs(NULL, ...) which makes it pretty useless as you can't
know the size of the needed buffer
b) OS X <= 10.2 declares and even defined these functions but
doesn't really implement them -- they always return an error
So use our own replacements in both cases.
*/
#if defined(__MWERKS__) && defined(__MSL__)
#define wxNEED_WX_MBSTOWCS
#endif
#ifdef __DARWIN__
#if !defined(__WXOSX_IPHONE__) && MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2
#define wxNEED_WX_MBSTOWCS