Remove support for MetroWerks CodeWarrior compiler.
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:
@@ -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
|
||||
|
@@ -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)
|
||||
// ----------------------------------------------------------------------------
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
//
|
||||
|
@@ -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
|
||||
//
|
||||
|
@@ -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
|
||||
|
@@ -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"
|
||||
|
Reference in New Issue
Block a user