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

2
include/wx/android/setup.h
View File

@@ -150,7 +150,7 @@
// In debug mode, causes new to be defined to be WXDEBUG_NEW (see object.h). If
// this causes problems (e.g. link errors), set this to 0. You may need to set
// this to 0 if using templates (at least for VC++). This switch is currently
// ignored for mingw / cygwin / CodeWarrior
// ignored for MinGW/Cygwin.
//
// Default is 0
//

7
include/wx/chartype.h
View File

@@ -48,16 +48,11 @@
Actually MinGW has tchar.h, but it does not include wchar.h
*/
#if defined(__MWERKS__) || defined(__VISAGECPP__) || defined(__MINGW32__) || defined(__WATCOMC__)
#if defined(__VISAGECPP__) || defined(__MINGW32__) || defined(__WATCOMC__)
#ifndef HAVE_WCHAR_H
#define HAVE_WCHAR_H
#endif
#endif
#if defined(__MWERKS__) && !defined(__MACH__)
#ifndef HAVE_WCSLEN
#define HAVE_WCSLEN
#endif
#endif
#ifdef HAVE_WCHAR_H
/* the current (as of Nov 2002) version of cygwin has a bug in its */

6
include/wx/datetime.h
View File

@@ -2107,9 +2107,9 @@ inline wxLongLong wxTimeSpan::GetSeconds() const
inline int wxTimeSpan::GetMinutes() const
{
// explicit cast to int suppresses a warning with CodeWarrior and possibly
// others (changing the return type to long from int is impossible in 2.8)
return (int)((GetSeconds() / 60l).GetLo());
// For compatibility, this method (and the other accessors) return int,
// even though GetLo() actually returns unsigned long with greater range.
return static_cast<int>((GetSeconds() / 60l).GetLo());
}
inline int wxTimeSpan::GetHours() const

67
include/wx/defs.h
View File

@@ -252,9 +252,6 @@ typedef short int WXTYPE;
#elif defined(__BORLANDC__) && (__BORLANDC__ >= 0x0520)
/* BC++ 4.52 doesn't support explicit, CBuilder 1 does */
#define HAVE_EXPLICIT
#elif defined(__MWERKS__) && (__MWERKS__ >= 0x2400)
/* Metrowerks CW6 or higher has explicit */
#define HAVE_EXPLICIT
#elif defined(__DIGITALMARS__)
#define HAVE_EXPLICIT
#elif defined(__WATCOMC__)
@@ -740,13 +737,6 @@ typedef short int WXTYPE;
/* compiler specific settings */
/* ---------------------------------------------------------------------------- */
#if defined(__MWERKS__)
#undef try
#undef except
#undef finally
#define except(x) catch(...)
#endif /* Metrowerks */
#if wxONLY_WATCOM_EARLIER_THAN(1,4)
typedef short mode_t;
#endif
@@ -754,13 +744,10 @@ typedef short int WXTYPE;
/* where should i put this? we need to make sure of this as it breaks */
/* the <iostream> code. */
#if !wxUSE_IOSTREAMH && defined(__WXDEBUG__)
# ifndef __MWERKS__
/* #undef __WXDEBUG__ */
# ifdef wxUSE_DEBUG_NEW_ALWAYS
# undef wxUSE_DEBUG_NEW_ALWAYS
# define wxUSE_DEBUG_NEW_ALWAYS 0
# endif
# endif
#endif
/* ---------------------------------------------------------------------------- */
@@ -777,9 +764,7 @@ enum { wxDefaultCoord = -1 };
/* ---------------------------------------------------------------------------- */
#if defined(__MINGW32__)
#if !defined(__MWERKS__)
#include <sys/types.h>
#endif
#endif
/* chars are always one byte (by definition), shorts are always two (in */
@@ -1006,15 +991,6 @@ typedef wxUint32 wxDword;
#define wxLongLong_t long long
#define wxLongLongSuffix ll
#define wxLongLongFmtSpec "I64"
#elif defined(__MWERKS__)
#if __option(longlong)
#define wxLongLong_t long long
#define wxLongLongSuffix ll
#define wxLongLongFmtSpec "ll"
#else
#error "The 64 bit integer support in CodeWarrior has been disabled."
#error "See the documentation on the 'longlong' pragma."
#endif
#elif defined(__VISAGECPP__) && __IBMCPP__ >= 400
#define wxLongLong_t long long
#elif (defined(SIZEOF_LONG_LONG) && SIZEOF_LONG_LONG >= 8) || \
@@ -1208,11 +1184,7 @@ inline void *wxUIntToPtr(wxUIntPtr p)
/* calculations */
typedef float wxFloat32;
#if (defined( __WXMAC__ ) || defined(__WXCOCOA__)) && defined (__MWERKS__)
typedef short double wxFloat64;
#else
typedef double wxFloat64;
#endif
typedef double wxFloat64;
typedef double wxDouble;
@@ -1290,36 +1262,6 @@ typedef double wxDouble;
/* byte swapping */
#if defined (__MWERKS__) && ( (__MWERKS__ < 0x0900) || macintosh )
/* assembler versions for these */
#ifdef __POWERPC__
inline wxUint16 wxUINT16_SWAP_ALWAYS( wxUint16 i )
{return (__lhbrx( &i , 0 ) );}
inline wxInt16 wxINT16_SWAP_ALWAYS( wxInt16 i )
{return (__lhbrx( &i , 0 ) );}
inline wxUint32 wxUINT32_SWAP_ALWAYS( wxUint32 i )
{return (__lwbrx( &i , 0 ) );}
inline wxInt32 wxINT32_SWAP_ALWAYS( wxInt32 i )
{return (__lwbrx( &i , 0 ) );}
#else
#pragma parameter __D0 wxUINT16_SWAP_ALWAYS(__D0)
pascal wxUint16 wxUINT16_SWAP_ALWAYS(wxUint16 value)
= { 0xE158 };
#pragma parameter __D0 wxINT16_SWAP_ALWAYS(__D0)
pascal wxInt16 wxINT16_SWAP_ALWAYS(wxInt16 value)
= { 0xE158 };
#pragma parameter __D0 wxUINT32_SWAP_ALWAYS (__D0)
pascal wxUint32 wxUINT32_SWAP_ALWAYS(wxUint32 value)
= { 0xE158, 0x4840, 0xE158 };
#pragma parameter __D0 wxINT32_SWAP_ALWAYS (__D0)
pascal wxInt32 wxINT32_SWAP_ALWAYS(wxInt32 value)
= { 0xE158, 0x4840, 0xE158 };
#endif
#else /* !MWERKS */
#define wxUINT16_SWAP_ALWAYS(val) \
((wxUint16) ( \
(((wxUint16) (val) & (wxUint16) 0x00ffU) << 8) | \
@@ -1343,7 +1285,6 @@ typedef double wxDouble;
(((wxUint32) (val) & (wxUint32) 0x0000ff00U) << 8) | \
(((wxUint32) (val) & (wxUint32) 0x00ff0000U) >> 8) | \
(((wxUint32) (val) & (wxUint32) 0xff000000U) >> 24)))
#endif
/* machine specific byte swapping */
#ifdef wxLongLong_t
@@ -2900,7 +2841,7 @@ typedef unsigned int NSUInteger;
*/
/* NOTE: This ought to work with other compilers too, but I'm being cautious */
#if (defined(__GNUC__) && defined(__APPLE__)) || defined(__MWERKS__)
#if (defined(__GNUC__) && defined(__APPLE__))
/* It's desirable to have type safety for Objective-C(++) code as it does
at least catch typos of method names among other things. However, it
is not possible to declare an Objective-C class from plain old C or C++
@@ -2920,7 +2861,7 @@ typedef klass *WX_##klass
typedef struct klass *WX_##klass
#endif /* defined(__OBJC__) */
#else /* not Apple's GNU or CodeWarrior */
#else /* not Apple's gcc */
#warning "Objective-C types will not be checked by the compiler."
/* NOTE: typedef struct objc_object *id; */
/* IOW, we're declaring these using the id type without using that name, */
@@ -2930,7 +2871,7 @@ typedef struct klass *WX_##klass
#define DECLARE_WXCOCOA_OBJC_CLASS(klass) \
typedef struct objc_object *WX_##klass
#endif /* (defined(__GNUC__) && defined(__APPLE__)) || defined(__MWERKS__) */
#endif /* (defined(__GNUC__) && defined(__APPLE__)) */
DECLARE_WXCOCOA_OBJC_CLASS(NSApplication);
DECLARE_WXCOCOA_OBJC_CLASS(NSBitmapImageRep);

5
include/wx/dlimpexp.h
View File

@@ -57,11 +57,6 @@
# define WXEXPORT _Export
# define WXIMPORT _Export
# endif
#elif defined(__WXMAC__) || defined(__WXCOCOA__)
# ifdef __MWERKS__
# define WXEXPORT __declspec(export)
# define WXIMPORT __declspec(import)
# endif
#elif defined(__CYGWIN__)
# define WXEXPORT __declspec(dllexport)
# define WXIMPORT __declspec(dllimport)

43
include/wx/filefn.h
View File

@@ -22,22 +22,9 @@
#include <time.h>
#endif
#ifdef __WXWINCE__
// Nothing
#elif !defined(__MWERKS__)
#ifndef __WXWINCE__
#include <sys/types.h>
#include <sys/stat.h>
#else
#ifdef __MACH__
#include <sys/types.h>
#include <utime.h>
#include <sys/stat.h>
#include <unistd.h>
#else
#include <stat.h>
#include <unistd.h>
#include <unix.h>
#endif
#endif
#ifdef __OS2__
@@ -58,7 +45,7 @@
#endif
#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
#if !defined( __GNUWIN32__ ) && !defined( __MWERKS__ ) && !defined(__WXWINCE__) && !defined(__CYGWIN__)
#if !defined( __GNUWIN32__ ) && !defined(__WXWINCE__) && !defined(__CYGWIN__)
#include <direct.h>
#include <dos.h>
#include <io.h>
@@ -106,12 +93,10 @@
#endif
#endif
#if (defined(__VISUALC__) && !defined(__WXWINCE__)) || ( defined(__MWERKS__) && defined( __INTEL__) )
#if defined(__VISUALC__) && !defined(__WXWINCE__)
typedef _off_t off_t;
#elif defined(__SYMANTEC__)
typedef long off_t;
#elif defined(__MWERKS__) && !defined(__INTEL__) && !defined(__MACH__)
typedef long off_t;
#endif
enum wxSeekMode
@@ -206,7 +191,6 @@ enum wxPosixPermissions
defined(__MINGW64__) || \
(defined(__MINGW32__) && !defined(__WINE__) && \
wxCHECK_W32API_VERSION(0, 5)) || \
defined(__MWERKS__) || \
defined(__DMC__) || \
defined(__WATCOMC__) || \
defined(__BORLANDC__) \
@@ -236,9 +220,8 @@ enum wxPosixPermissions
#define wxFtell ftello64
#endif
// other Windows compilers (DMC, Watcom, Metrowerks and Borland) don't have
// huge file support (or at least not all functions needed for it by wx)
// currently
// other Windows compilers (DMC, Watcom, and Borland) don't have huge file
// support (or at least not all functions needed for it by wx) currently
// types
@@ -309,20 +292,8 @@ enum wxPosixPermissions
// complications
#define wxClose wxPOSIX_IDENT(close)
#if defined(__MWERKS__)
#if __MSL__ >= 0x6000
#define wxRead(fd, buf, nCount) _read(fd, (void *)buf, nCount)
#define wxWrite(fd, buf, nCount) _write(fd, (void *)buf, nCount)
#else
#define wxRead(fd, buf, nCount)\
_read(fd, (const char *)buf, nCount)
#define wxWrite(fd, buf, nCount)\
_write(fd, (const char *)buf, nCount)
#endif
#else // __MWERKS__
#define wxRead wxPOSIX_IDENT(read)
#define wxWrite wxPOSIX_IDENT(write)
#endif
#define wxRead wxPOSIX_IDENT(read)
#define wxWrite wxPOSIX_IDENT(write)
#ifdef wxHAS_HUGE_FILES
#ifndef __MINGW64__

3
include/wx/hashmap.h
View File

@@ -689,8 +689,7 @@ public: \
/* count() == 0 | 1 */ \
size_type count( const const_key_type& key ) \
{ \
/* explicit cast needed to suppress CodeWarrior warnings */ \
return (size_type)(GetNode( key ) ? 1 : 0); \
return GetNode( key ) ? 1u : 0u; \
} \
}

4
include/wx/math.h
View File

@@ -65,7 +65,7 @@
#define wxFinite(x) isfinite(x)
#elif ( defined(__GNUG__)||defined(__GNUWIN32__)||defined(__DJGPP__)|| \
defined(__SGI_CC__)||defined(__SUNCC__)||defined(__XLC__)|| \
defined(__HPUX__)||defined(__MWERKS__) ) && ( !defined(wxOSX_USE_IPHONE) || wxOSX_USE_IPHONE == 0 )
defined(__HPUX__) ) && ( !defined(wxOSX_USE_IPHONE) || wxOSX_USE_IPHONE == 0 )
#ifdef __SOLARIS__
#include <ieeefp.h>
#endif
@@ -79,7 +79,7 @@
#define wxIsNaN(x) _isnan(x)
#elif defined(__GNUG__)||defined(__GNUWIN32__)||defined(__DJGPP__)|| \
defined(__SGI_CC__)||defined(__SUNCC__)||defined(__XLC__)|| \
defined(__HPUX__)||defined(__MWERKS__)
defined(__HPUX__)
#define wxIsNaN(x) isnan(x)
#else
#define wxIsNaN(x) ((x) != (x))

8
include/wx/memory.h
View File

@@ -43,14 +43,14 @@ WXDLLIMPEXP_BASE void wxDebugFree(void * buf, bool isVect = false);
#if defined(__SUNCC__)
#define wxUSE_ARRAY_MEMORY_OPERATORS 0
#elif !( defined (__VISUALC__) && (__VISUALC__ <= 1020) ) || defined( __MWERKS__)
#elif !( defined (__VISUALC__) && (__VISUALC__ <= 1020) )
#define wxUSE_ARRAY_MEMORY_OPERATORS 1
#elif defined (__SGI_CC_)
// only supported by -n32 compilers
#ifndef __EDG_ABI_COMPATIBILITY_VERSION
#define wxUSE_ARRAY_MEMORY_OPERATORS 0
#endif
#elif !( defined (__VISUALC__) && (__VISUALC__ <= 1020) ) || defined( __MWERKS__)
#elif !( defined (__VISUALC__) && (__VISUALC__ <= 1020) )
#define wxUSE_ARRAY_MEMORY_OPERATORS 1
#else
// ::operator new[] is a recent C++ feature, so assume it's not supported
@@ -110,8 +110,8 @@ void operator delete[] (void * buf);
#endif // wxUSE_ARRAY_MEMORY_OPERATORS
#endif // defined(__WINDOWS__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE))
// VC++ 6.0 and MWERKS
#if ( defined(__VISUALC__) && (__VISUALC__ >= 1200) ) || defined(__MWERKS__)
// VC++ 6.0
#if ( defined(__VISUALC__) && (__VISUALC__ >= 1200) )
inline void operator delete(void* pData, wxChar* /* fileName */, int /* lineNum */)
{
wxDebugFree(pData, false);

2
include/wx/motif/setup0.h
View File

@@ -151,7 +151,7 @@
// In debug mode, causes new to be defined to be WXDEBUG_NEW (see object.h). If
// this causes problems (e.g. link errors), set this to 0. You may need to set
// this to 0 if using templates (at least for VC++). This switch is currently
// ignored for mingw / cygwin / CodeWarrior
// ignored for MinGW/Cygwin.
//
// Default is 0
//

6
include/wx/msw/chkconf.h
View File

@@ -155,12 +155,6 @@
# define wxUSE_STACKWALKER 0
#endif /* compiler doesn't support SEH */
/* wxUSE_DEBUG_NEW_ALWAYS doesn't work with CodeWarrior */
#if defined(__MWERKS__)
# undef wxUSE_DEBUG_NEW_ALWAYS
# define wxUSE_DEBUG_NEW_ALWAYS 0
#endif
#if defined(__GNUWIN32__)
/* These don't work as expected for mingw32 and cygwin32 */
# undef wxUSE_MEMORY_TRACING

2
include/wx/msw/ole/oleutils.h
View File

@@ -192,7 +192,7 @@ private:
// VZ: I don't know it's not done for compilers other than VC++ but I leave it
// as is. Please note, though, that tracing OLE interface calls may be
// incredibly useful when debugging OLE programs.
#if defined(__WXDEBUG__) && ( ( defined(__VISUALC__) && (__VISUALC__ >= 1000) ) || defined(__MWERKS__) )
#if defined(__WXDEBUG__) && (( defined(__VISUALC__) && (__VISUALC__ >= 1000) ))
// ----------------------------------------------------------------------------
// All OLE specific log functions have DebugTrace level (as LogTrace)
// ----------------------------------------------------------------------------

9
include/wx/msw/private.h
View File

@@ -169,9 +169,9 @@ extern LONG APIENTRY _EXPORT
// This one is a macro so that it can be tested with #ifdef, it will be
// undefined if it cannot be implemented for a given compiler.
// Vc++, bcc, dmc, ow, mingw, codewarrior (and rsxnt) have _get_osfhandle.
// Cygwin has get_osfhandle. Others are currently unknown, e.g. Salford,
// Intel, Visual Age.
// Vc++, bcc, dmc, ow, mingw akk have _get_osfhandle() and Cygwin has
// get_osfhandle. Others are currently unknown, e.g. Salford, Intel, Visual
// Age.
#if defined(__WXWINCE__)
#define wxGetOSFHandle(fd) ((HANDLE)fd)
#define wxOpenOSFHandle(h, flags) ((int)wxPtrToUInt(h))
@@ -181,8 +181,7 @@ extern LONG APIENTRY _EXPORT
|| defined(__BORLANDC__) \
|| defined(__DMC__) \
|| defined(__WATCOMC__) \
|| defined(__MINGW32__) \
|| (defined(__MWERKS__) && defined(__MSL__))
|| defined(__MINGW32__)
#define wxGetOSFHandle(fd) ((HANDLE)_get_osfhandle(fd))
#define wxOpenOSFHandle(h, flags) (_open_osfhandle(wxPtrToUInt(h), flags))
#define wx_fdopen _fdopen

2
include/wx/msw/setup0.h
View File

@@ -151,7 +151,7 @@
// In debug mode, causes new to be defined to be WXDEBUG_NEW (see object.h). If
// this causes problems (e.g. link errors), set this to 0. You may need to set
// this to 0 if using templates (at least for VC++). This switch is currently
// ignored for mingw / cygwin / CodeWarrior
// ignored for MinGW/Cygwin.
//
// Default is 0
//

2
include/wx/msw/wince/setup.h
View File

@@ -151,7 +151,7 @@
// In debug mode, causes new to be defined to be WXDEBUG_NEW (see object.h). If
// this causes problems (e.g. link errors), set this to 0. You may need to set
// this to 0 if using templates (at least for VC++). This switch is currently
// ignored for mingw / cygwin / CodeWarrior
// ignored for MinGW/Cygwin.
//
// Default is 0
//

12
include/wx/msw/winundef.h
View File

@@ -248,18 +248,6 @@
#endif
/*
When this file is included, sometimes the wxCHECK_W32API_VERSION macro
is undefined. With for example CodeWarrior this gives problems with
the following code:
#if 0 && wxCHECK_W32API_VERSION( 0, 5 )
Because CodeWarrior does macro expansion before test evaluation.
We define wxCHECK_W32API_VERSION here if it's undefined.
*/
#if !defined(__GNUG__) && !defined(wxCHECK_W32API_VERSION)
#define wxCHECK_W32API_VERSION(maj, min) (0)
#endif
// StartDoc
#ifdef StartDoc

4
include/wx/msw/wx.rc
View File

@@ -10,11 +10,7 @@
// Licence: wxWindows Licence
/////////////////////////////////////////////////////////////////////////////
#if defined(__MWERKS__)
#include <winresrc.h>
#else
#include <windows.h>
#endif
#if defined(_WIN32_WCE)
#include "wx/msw/wince/wince.rc"

11
include/wx/object.h
View File

@@ -195,9 +195,8 @@ inline T *wxCheckCast(const void *ptr, T * = NULL)
#define _WX_WANT_DELETE_VOID_CONSTCHAR_SIZET
#endif
// Only VC++ 6 and CodeWarrior get overloaded delete that matches new
#if (defined(__VISUALC__) && (__VISUALC__ >= 1200)) || \
(defined(__MWERKS__) && (__MWERKS__ >= 0x2400))
// Only VC++ 6 gets overloaded delete that matches new
#if (defined(__VISUALC__) && (__VISUALC__ >= 1200))
#define _WX_WANT_DELETE_VOID_WXCHAR_INT
#endif
@@ -213,12 +212,6 @@ inline T *wxCheckCast(const void *ptr, T * = NULL)
#if !defined(__VISUALC__)
#define _WX_WANT_ARRAY_DELETE_VOID
#endif
// Only CodeWarrior 6 or higher
#if defined(__MWERKS__) && (__MWERKS__ >= 0x2400)
#define _WX_WANT_ARRAY_DELETE_VOID_WXCHAR_INT
#endif
#endif // wxUSE_ARRAY_MEMORY_OPERATORS
#endif // wxUSE_MEMORY_TRACING

2
include/wx/os2/setup0.h
View File

@@ -151,7 +151,7 @@
// In debug mode, causes new to be defined to be WXDEBUG_NEW (see object.h). If
// this causes problems (e.g. link errors), set this to 0. You may need to set
// this to 0 if using templates (at least for VC++). This switch is currently
// ignored for mingw / cygwin / CodeWarrior
// ignored for MinGW/Cygwin.
//
// Default is 0
//

14
include/wx/osx/chkconf.h
View File

@@ -21,20 +21,6 @@
# define wxUSE_STACKWALKER 0
#endif /* wxUSE_STACKWALKER */
/*
* disable the settings which don't work for some compilers
*/
#if defined(__MWERKS__)
#undef wxUSE_DEBUG_NEW_ALWAYS
#define wxUSE_DEBUG_NEW_ALWAYS 0
/* DS: Fixes compilation when wxUSE_ON_FATAL_EXCEPTION is 1 */
#ifndef wxTYPE_SA_HANDLER
#define wxTYPE_SA_HANDLER int
#endif
#endif
/*
* check graphics context option, must be on for every os x platform
* we only use core graphics now on all builds, try to catch attempts

1
include/wx/osx/core/hid.h
View File

@@ -34,7 +34,6 @@
//Darn apple - doesn't properly wrap their headers in extern "C"!
//http://www.macosx.com/forums/archive/index.php/t-68069.html
//Needed for codewarrior link error with mach_port_deallocate()
extern "C" {
#include <mach/mach_port.h>
}

15
include/wx/osx/setup0.h
View File

@@ -152,7 +152,7 @@
// In debug mode, causes new to be defined to be WXDEBUG_NEW (see object.h). If
// this causes problems (e.g. link errors), set this to 0. You may need to set
// this to 0 if using templates (at least for VC++). This switch is currently
// ignored for mingw / cygwin / CodeWarrior
// ignored for MinGW/Cygwin.
//
// Default is 0
//
@@ -1501,19 +1501,6 @@
// Mac-specific settings
// ----------------------------------------------------------------------------
// override some settings for Metrowerks
//
// VZ: isn't this file only used when building with Metrowerks anyhow?
// CS: no, it is also used by the Xcode projects
#ifdef __MWERKS__
#undef wxUSE_DEBUG_CONTEXT
#define wxUSE_DEBUG_CONTEXT 1
#undef wxUSE_STD_IOSTREAM
// CS: I have to set this to 0 now, as shared builds are having problems
#define wxUSE_STD_IOSTREAM 0
#endif
#undef wxUSE_GRAPHICS_CONTEXT
#define wxUSE_GRAPHICS_CONTEXT 1

30
include/wx/platform.h
View File

@@ -14,16 +14,6 @@
#ifndef _WX_PLATFORM_H_
#define _WX_PLATFORM_H_
/*
Codewarrior doesn't define any Windows symbols until some headers
are included
*/
#ifdef __MWERKS__
# include <stddef.h>
#endif
#ifdef __WXMAC_XCODE__
# include <unistd.h>
# include <TargetConditionals.h>
@@ -236,11 +226,6 @@
# endif
#endif /* wxUSE_UNICODE */
#if defined( __MWERKS__ ) && !defined(__INTEL__)
/* otherwise MSL headers bring in WIN32 dependant APIs */
#undef UNICODE
#endif
/*
test for old versions of Borland C, normally need at least 5.82, Turbo
@@ -397,17 +382,6 @@
# endif
# endif
/*
OS: Classic Mac OS
*/
#elif defined(applec) || \
defined(THINK_C) || \
(defined(__MWERKS__) && !defined(__INTEL__))
/* MacOS */
# if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG)
# define wxSIZE_T_IS_ULONG
# endif
/*
OS: OS/2
*/
@@ -446,9 +420,9 @@
/*
define another standard symbol for Microsoft Visual C++: the standard
one (_MSC_VER) is also defined by Metrowerks compiler
one (_MSC_VER) is also defined by some other compilers.
*/
# if defined(_MSC_VER) && !defined(__MWERKS__)
# if defined(_MSC_VER)
# define __VISUALC__ _MSC_VER
/*

5
include/wx/private/wxprintf.h
View File

@@ -22,11 +22,6 @@
#include <string.h>
#if defined(__MWERKS__) && __MSL__ >= 0x6000
namespace std {}
using namespace std ;
#endif
// prefer snprintf over sprintf
#if defined(__VISUALC__) || \
(defined(__BORLANDC__) && __BORLANDC__ >= 0x540)

2
include/wx/setup_inc.h
View File

@@ -147,7 +147,7 @@
// In debug mode, causes new to be defined to be WXDEBUG_NEW (see object.h). If
// this causes problems (e.g. link errors), set this to 0. You may need to set
// this to 0 if using templates (at least for VC++). This switch is currently
// ignored for mingw / cygwin / CodeWarrior
// ignored for MinGW/Cygwin.
//
// Default is 0
//

10
include/wx/string.h
View File

@@ -154,7 +154,7 @@ inline int Stricmp(const char *psz1, const char *psz2)
} while ( c1 && (c1 == c2) );
return c1 - c2;
#elif defined(__VISUALC__) || ( defined(__MWERKS__) && defined(__INTEL__) )
#elif defined(__VISUALC__)
return _stricmp(psz1, psz2);
#elif defined(__SC__)
return _stricmp(psz1, psz2);
@@ -172,14 +172,6 @@ inline int Stricmp(const char *psz1, const char *psz2)
defined(HAVE_STRCASECMP_IN_STRINGS_H) || \
defined(__GNUWIN32__)
return strcasecmp(psz1, psz2);
#elif defined(__MWERKS__) && !defined(__INTEL__)
register char c1, c2;
do {
c1 = tolower(*psz1++);
c2 = tolower(*psz2++);
} while ( c1 && (c1 == c2) );
return c1 - c2;
#else
// almost all compilers/libraries provide this function (unfortunately under
// different names), that's why we don't implement our own which will surely

1
include/wx/textctrl.h
View File

@@ -28,7 +28,6 @@
// some compilers don't have standard compliant rdbuf() (and MSVC has it only
// in its new iostream library, not in the old one used with iostream.h)
#if defined(__WATCOMC__) || \
defined(__MWERKS__) || \
((defined(__VISUALC5__) || defined(__VISUALC6__)) && wxUSE_IOSTREAMH)
#define wxHAS_TEXT_WINDOW_STREAM 0
#elif wxUSE_STD_IOSTREAM

4
include/wx/thread.h
View File

@@ -266,10 +266,6 @@ private:
//
// if CRITICAL_SECTION size changes in Windows, you'll get an assert from
// thread.cpp and will need to increase the buffer size
//
// finally, we need this typedef instead of declaring m_buffer directly
// because otherwise the assert mentioned above wouldn't compile with some
// compilers (notably CodeWarrior 8)
#ifdef __WIN64__
typedef char wxCritSectBuffer[40];
#else // __WIN32__

2
include/wx/univ/setup0.h
View File

@@ -150,7 +150,7 @@
// In debug mode, causes new to be defined to be WXDEBUG_NEW (see object.h). If
// this causes problems (e.g. link errors), set this to 0. You may need to set
// this to 0 if using templates (at least for VC++). This switch is currently
// ignored for mingw / cygwin / CodeWarrior
// ignored for MinGW/Cygwin.
//
// Default is 0
//

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

6
include/wx/wxcrtvararg.h
View File

@@ -150,12 +150,8 @@
#define wxCRT_VsnprintfW _vsnwprintf
#endif
/*
All versions of CodeWarrior supported by wxWidgets apparently
have both snprintf() and vsnprintf()
*/
#if defined(HAVE_VSNPRINTF) \
|| defined(__MWERKS__) || defined(__WATCOMC__)
|| defined(__WATCOMC__)
#ifdef HAVE_BROKEN_VSNPRINTF_DECL
#define wxCRT_VsnprintfA wx_fixed_vsnprintf
#else

1
include/wx/wxprec.h
View File

@@ -17,7 +17,6 @@
#if defined(__VISUALC__) || \
defined(__DMC__) || \
defined(__VISAGECPP__) || \
defined(__MWERKS__) || \
defined(__WATCOMC__) || \
defined(__BORLANDC__)