From 2415cf6725d5cfb11f52d29e5d28dfdaa197b366 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 5 Apr 2012 18:40:11 +0000 Subject: [PATCH] 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 --- configure | 8 +-- configure.in | 13 +---- docs/cocoa/install.txt | 4 -- docs/doxygen/mainpages/const_cpp.h | 4 +- docs/doxygen/mainpages/introduction.h | 5 +- docs/msw/install.txt | 72 +-------------------------- include/wx/android/setup.h | 2 +- include/wx/chartype.h | 7 +-- include/wx/datetime.h | 6 +-- include/wx/defs.h | 67 ++----------------------- include/wx/dlimpexp.h | 5 -- include/wx/filefn.h | 43 +++------------- include/wx/hashmap.h | 3 +- include/wx/math.h | 4 +- include/wx/memory.h | 8 +-- include/wx/motif/setup0.h | 2 +- include/wx/msw/chkconf.h | 6 --- include/wx/msw/ole/oleutils.h | 2 +- include/wx/msw/private.h | 9 ++-- include/wx/msw/setup0.h | 2 +- include/wx/msw/wince/setup.h | 2 +- include/wx/msw/winundef.h | 12 ----- include/wx/msw/wx.rc | 4 -- include/wx/object.h | 11 +--- include/wx/os2/setup0.h | 2 +- include/wx/osx/chkconf.h | 14 ------ include/wx/osx/core/hid.h | 1 - include/wx/osx/setup0.h | 15 +----- include/wx/platform.h | 30 +---------- include/wx/private/wxprintf.h | 5 -- include/wx/setup_inc.h | 2 +- include/wx/string.h | 10 +--- include/wx/textctrl.h | 1 - include/wx/thread.h | 4 -- include/wx/univ/setup0.h | 2 +- include/wx/wxcrtbase.h | 61 ++++------------------- include/wx/wxcrtvararg.h | 6 +-- include/wx/wxprec.h | 1 - interface/wx/debug.h | 2 +- interface/wx/textfile.h | 6 +-- src/common/file.cpp | 2 +- src/common/filefn.cpp | 5 +- src/common/filename.cpp | 17 +------ src/common/ftp.cpp | 4 +- src/common/memory.cpp | 3 +- src/common/sckaddr.cpp | 4 +- src/common/string.cpp | 6 --- src/common/textbuf.cpp | 5 -- src/common/time.cpp | 13 ----- src/common/utilscmn.cpp | 2 +- src/common/variant.cpp | 5 -- src/common/wxcrt.cpp | 13 ++--- src/generic/logg.cpp | 4 -- src/jpeg/jconfig.h | 30 ----------- src/msw/dib.cpp | 4 +- src/msw/ole/dataobj.cpp | 3 +- src/msw/ole/oleutils.cpp | 4 +- src/msw/thread.cpp | 2 +- src/msw/utils.cpp | 4 +- src/msw/utilsexc.cpp | 2 - src/osx/carbon/graphics.cpp | 2 - src/osx/carbon/utils.cpp | 6 --- src/osx/utils_osx.cpp | 6 --- src/unix/utilsunx.cpp | 20 -------- tests/archive/archivetest.cpp | 3 -- 65 files changed, 80 insertions(+), 552 deletions(-) diff --git a/configure b/configure index 90b0e3cf35..d9bf770b06 100755 --- a/configure +++ b/configure @@ -39218,7 +39218,7 @@ if test "${wx_cv_func_vsnprintf_decl+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -39227,12 +39227,6 @@ cat >>conftest.$ac_ext <<_ACEOF #include #include - #ifdef __MSL__ - #if __MSL__ >= 0x6000 - namespace std {} - using namespace std; - #endif - #endif int main () diff --git a/configure.in b/configure.in index 35d5048f14..afea6d29d3 100644 --- a/configure.in +++ b/configure.in @@ -4204,19 +4204,11 @@ if test "$ac_cv_func_vsnprintf" = "yes"; then AC_CACHE_CHECK([for vsnprintf declaration], wx_cv_func_vsnprintf_decl, [ dnl our troubles are not over: HP-UX 11 prototypes vsnprintf() as - dnl taking "char *" and not "const char *" while Metrowerks does - dnl provide a correct vsnprintf declaration but in C++ mode it's - dnl always in std namespace and so we have to bring it in scope + dnl taking "char *" and not "const char *" so test for this too AC_TRY_COMPILE( [ #include #include - #ifdef __MSL__ - #if __MSL__ >= 0x6000 - namespace std {} - using namespace std; - #endif - #endif ], [ char *buf; @@ -7876,8 +7868,7 @@ dnl add -I options we use during library compilation dnl dnl note that the order is somewhat important: wxWidgets headers should dnl come first and the one with setup.h should be before $(top_srcdir)/include -dnl in case the latter contains setup.h used by non-autoconf makefiles (e.g. -dnl CodeWarrior): +dnl in case the latter contains setup.h used by non-autoconf makefiles CPPFLAGS=`echo $WXCONFIG_CPPFLAGS \ -I\\${wx_top_builddir}/lib/wx/include/${TOOLCHAIN_FULLNAME} \ -I\\${top_srcdir}/include $TOOLKIT_INCLUDE \ diff --git a/docs/cocoa/install.txt b/docs/cocoa/install.txt index 2235eb0b93..a7a5cb3f66 100644 --- a/docs/cocoa/install.txt +++ b/docs/cocoa/install.txt @@ -9,10 +9,6 @@ To compile it, you will need Apple's Developer Tools. However, please note that any work to make it suitable for GNUstep (which will require a GCC release with Objective-C++) will be much appreciated. -Some users also report success with Metrowerks CodeWarrior IDE and I've even -on occasion used the command-line MW compilers (see docs/metrowerks) with -configure instead of GCC and Apple's LD. - Like most UNIX ports, the standard configure/make method works. You should be able to build the library as static or shared. I usually build static. diff --git a/docs/doxygen/mainpages/const_cpp.h b/docs/doxygen/mainpages/const_cpp.h index ea97707bdd..f3ecc50271 100644 --- a/docs/doxygen/mainpages/const_cpp.h +++ b/docs/doxygen/mainpages/const_cpp.h @@ -88,8 +88,7 @@ symbols, although this has not always been followed. @itemdef{__AIX__, AIX} @itemdef{__BSD__, Any *BSD system} @itemdef{__CYGWIN__, Cygwin: Unix on Win32} -@itemdef{__DARWIN__, Mac OS X using the BSD Unix C library - (as opposed to using the Metrowerks MSL C/C++ library)} +@itemdef{__DARWIN__, Mac OS X (with BSD C library)} @itemdef{__DATA_GENERAL__, DG-UX} @itemdef{__FREEBSD__, FreeBSD} @itemdef{__HPUX__, HP-UX (Unix)} @@ -157,7 +156,6 @@ compiler used. @itemdef{__GNUG__, Gnu C++ on any platform, see also wxCHECK_GCC_VERSION} @itemdef{__GNUWIN32__, Gnu-Win32 compiler, see also wxCHECK_W32API_VERSION} @itemdef{__MINGW32__, MinGW} -@itemdef{__MWERKS__, CodeWarrior MetroWerks compiler} @itemdef{__SUNCC__, Sun CC, see also wxCHECK_SUNCC_VERSION} @itemdef{__SYMANTECC__, Symantec C++} @itemdef{__VISAGECPP__, IBM Visual Age (OS/2)} diff --git a/docs/doxygen/mainpages/introduction.h b/docs/doxygen/mainpages/introduction.h index 6501c84077..e126826ea1 100644 --- a/docs/doxygen/mainpages/introduction.h +++ b/docs/doxygen/mainpages/introduction.h @@ -127,9 +127,8 @@ To make use of wxWidgets, you currently need one of the following setups. @li A 32-bit or 64-bit PC running MS Windows. @li A Windows compiler: MS Visual C++ (embedded Visual C++ for wxWinCE - port), Borland C++, Watcom C++, Cygwin, MinGW, Metrowerks CodeWarrior, - Digital Mars C++. See @c install.txt for details about compiler - version supported. + port), Borland C++, Watcom C++, Cygwin, MinGW, Digital Mars C++. + See @c install.txt for details about compiler version supported. (b) Unix: diff --git a/docs/msw/install.txt b/docs/msw/install.txt index 74f4101987..c6293f691c 100644 --- a/docs/msw/install.txt +++ b/docs/msw/install.txt @@ -64,7 +64,7 @@ The following sections explain how to compile wxWidgets with each supported compiler, see the "Building Applications" section about the instructions for building your application using wxWidgets. -Search for one of Microsoft/Borland/Watcom/Symantec/Metrowerks/Cygwin/Mingw32 +Search for one of Microsoft/Borland/Watcom/Symantec/Cygwin/Mingw32 keywords to quickly locate the instructions for your compiler. Notice that the primary compilers for wxWidgets under MSW are Microsoft Visual C++ and GNU g++, other compilers are more rarely tested and might not work so please consider using @@ -379,76 +379,6 @@ Note (4): wxUSE_STD_STRING is disabled in wx/string.h for Watcom as this for __WATCOM__). -Metrowerks CodeWarrior Compilation ----------------------------------------------------------------- - -** NOTE: We don't use Metrowerks compiler any more and so depend on -** your contributions to keep it up to date. It is possible that -** the project files mentioned below are out of date due to recently -** added files, please add them manually if you get linking errors. -** The authoritative list of files is in build/bakefiles/files.bkl - -1. CodeWarrior Pro 7 project files in XML format are already - included in wxMSW-2.8.x.zip and the setup version. - -2. Review the file include\wx\msw\setup.h (or include\wx\msw\setup0.h if - you are working from the SVN version) to make sure the settings reflect - what you want. If you aren't sure, leave it alone and go with the - default settings. A few notes: - - Don't use wxUSE_DEBUG_NEW_ALWAYS: it doesn't mix well with MSL - - wxUSE_GLOBAL_MEMORY_OPERATORS works, but memory leak reports - will be rather confusing due to interactions with the MSL ANSI - and runtime libs. - -3. The project file to build the Win32 wxWidgets libraries relies on the - Batch File Runner plug-in. This plug-in is not installed as part of - a normal CW7 installation. However, you can find this plug-in on the - CodeWarrior Reference CD, in the Thrill Seekers folder; it's called the - "Batch File Post Linker". - -4. If you choose not to install the Batch File Runner plug-in, then you - need to do the following by hand: - (1) Create the directories lib\cw7msw\include\wx and copy the file - include\wx\msw\setup.h (or include\wx\msw\setup0.h if you are - working from the SVN version) to lib\cw7msw\include\wx\setup.h - (2) Create the directories lib\cw7mswd\include\wx and copy the file - include\wx\msw\setup.h (or include\wx\msw\setup0.h if you are - working from the SVN version) to lib\cw7mswd\include\wx\setup.h - -5. Import src\wxWidgetsW7.xml to create the project file wxWidgetsW7.mcp. - Store this project file in directory src. You may get warnings about - not being able to find certain project paths; ignore these warnings, the - appropriate paths will be created during the build by the Batch File Runner. - -6. Choose the wxlib Win32 debug or wxlib Win32 Release target and build. You - will get some warnings about hidden virtual functions, illegal conversions - from const pointers to pointers, etc., all of which you can safely ignore. - ***Note: if you get errors that the compiler can't find "wx/setup.h", just - stop the build and build again. These errors occur because sometimes the - compiler starts doing its thing before the copying of setup.h has completed. - -7. The following libraries will be produced depending on chosen - target: - - wx_x86.lib ANSI Release (static) - - wx_x86_d.lib ANSI Debug (static) - -8. Sorry, I haven't had time yet to create and test Unicode or DLL versions. - Volunteers for this are welcome (as neither DLLs nor Unicode builds are - big priorities for me ;). - -9. CodeWarrior Pro7 project files (in XML format) are also provided for some - of the samples. In particular, there are project files for the minimal, - controls, dialogs, dnd, nd docview samples. You can use these project - files as templates for the other samples and for your own projects. - - For example, to make a project file for the "grid" sample, - just copy the project file for the "minimal" sample, minimalW7.mcp - (made by importing minimalW7.xml into CodeWarrior), into the - sample/grid directory, calling it gridW7.mcp. Open - newgridW7.mcp and revise the project by deleting the files - minimal.rc and minimal.cpp and adding the files griddemo.rc and - griddemo.cpp. Build and run.... - - Cygwin/MinGW Compilation ---------------------------------------------------------------- diff --git a/include/wx/android/setup.h b/include/wx/android/setup.h index c95aaba7a7..ac70507ed9 100644 --- a/include/wx/android/setup.h +++ b/include/wx/android/setup.h @@ -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 // diff --git a/include/wx/chartype.h b/include/wx/chartype.h index a0c527ba26..b2c3342500 100644 --- a/include/wx/chartype.h +++ b/include/wx/chartype.h @@ -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 */ diff --git a/include/wx/datetime.h b/include/wx/datetime.h index 9deab532e1..75eb188a9f 100644 --- a/include/wx/datetime.h +++ b/include/wx/datetime.h @@ -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((GetSeconds() / 60l).GetLo()); } inline int wxTimeSpan::GetHours() const diff --git a/include/wx/defs.h b/include/wx/defs.h index 49440aef7f..c57541cde8 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -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 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 - #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); diff --git a/include/wx/dlimpexp.h b/include/wx/dlimpexp.h index fc5e008f9d..9e497270e1 100644 --- a/include/wx/dlimpexp.h +++ b/include/wx/dlimpexp.h @@ -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) diff --git a/include/wx/filefn.h b/include/wx/filefn.h index a10d97ce11..ad0333d669 100644 --- a/include/wx/filefn.h +++ b/include/wx/filefn.h @@ -22,22 +22,9 @@ #include #endif -#ifdef __WXWINCE__ -// Nothing -#elif !defined(__MWERKS__) +#ifndef __WXWINCE__ #include #include -#else - #ifdef __MACH__ - #include - #include - #include - #include - #else - #include - #include - #include - #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 #include #include @@ -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__ diff --git a/include/wx/hashmap.h b/include/wx/hashmap.h index f1b72a80f8..a2cc550e0f 100644 --- a/include/wx/hashmap.h +++ b/include/wx/hashmap.h @@ -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; \ } \ } diff --git a/include/wx/math.h b/include/wx/math.h index 38b444e2df..5ce3ff1c36 100644 --- a/include/wx/math.h +++ b/include/wx/math.h @@ -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 #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)) diff --git a/include/wx/memory.h b/include/wx/memory.h index ede7380a6c..333b937436 100644 --- a/include/wx/memory.h +++ b/include/wx/memory.h @@ -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); diff --git a/include/wx/motif/setup0.h b/include/wx/motif/setup0.h index 3f87e116be..a6eab82ee2 100644 --- a/include/wx/motif/setup0.h +++ b/include/wx/motif/setup0.h @@ -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 // diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h index 03672e924d..6f6e6f3082 100644 --- a/include/wx/msw/chkconf.h +++ b/include/wx/msw/chkconf.h @@ -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 diff --git a/include/wx/msw/ole/oleutils.h b/include/wx/msw/ole/oleutils.h index bd1a294c2e..973bbb9982 100644 --- a/include/wx/msw/ole/oleutils.h +++ b/include/wx/msw/ole/oleutils.h @@ -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) // ---------------------------------------------------------------------------- diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h index 63010bf4c5..2875d294c7 100644 --- a/include/wx/msw/private.h +++ b/include/wx/msw/private.h @@ -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 diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h index 02dbb9aa03..22feb8ff63 100644 --- a/include/wx/msw/setup0.h +++ b/include/wx/msw/setup0.h @@ -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 // diff --git a/include/wx/msw/wince/setup.h b/include/wx/msw/wince/setup.h index bc48373e26..d91fbf8843 100644 --- a/include/wx/msw/wince/setup.h +++ b/include/wx/msw/wince/setup.h @@ -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 // diff --git a/include/wx/msw/winundef.h b/include/wx/msw/winundef.h index 41cea6dc90..e012910321 100644 --- a/include/wx/msw/winundef.h +++ b/include/wx/msw/winundef.h @@ -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 diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc index 28da79650a..d9aff3b171 100644 --- a/include/wx/msw/wx.rc +++ b/include/wx/msw/wx.rc @@ -10,11 +10,7 @@ // Licence: wxWindows Licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__MWERKS__) -#include -#else #include -#endif #if defined(_WIN32_WCE) #include "wx/msw/wince/wince.rc" diff --git a/include/wx/object.h b/include/wx/object.h index 78de253330..cb9d8f8c98 100644 --- a/include/wx/object.h +++ b/include/wx/object.h @@ -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 diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h index e5dfea236d..45379059d8 100644 --- a/include/wx/os2/setup0.h +++ b/include/wx/os2/setup0.h @@ -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 // diff --git a/include/wx/osx/chkconf.h b/include/wx/osx/chkconf.h index d205f75ccc..98e950215f 100644 --- a/include/wx/osx/chkconf.h +++ b/include/wx/osx/chkconf.h @@ -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 diff --git a/include/wx/osx/core/hid.h b/include/wx/osx/core/hid.h index e7d237a38e..84a4907d95 100644 --- a/include/wx/osx/core/hid.h +++ b/include/wx/osx/core/hid.h @@ -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 } diff --git a/include/wx/osx/setup0.h b/include/wx/osx/setup0.h index 7a9ed38d59..1bc7474fb2 100644 --- a/include/wx/osx/setup0.h +++ b/include/wx/osx/setup0.h @@ -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 diff --git a/include/wx/platform.h b/include/wx/platform.h index 7feddf3609..50476b9e5f 100644 --- a/include/wx/platform.h +++ b/include/wx/platform.h @@ -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 -#endif - #ifdef __WXMAC_XCODE__ # include # include @@ -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 /* diff --git a/include/wx/private/wxprintf.h b/include/wx/private/wxprintf.h index 5c1e4ff348..682adfbc50 100644 --- a/include/wx/private/wxprintf.h +++ b/include/wx/private/wxprintf.h @@ -22,11 +22,6 @@ #include -#if defined(__MWERKS__) && __MSL__ >= 0x6000 -namespace std {} -using namespace std ; -#endif - // prefer snprintf over sprintf #if defined(__VISUALC__) || \ (defined(__BORLANDC__) && __BORLANDC__ >= 0x540) diff --git a/include/wx/setup_inc.h b/include/wx/setup_inc.h index f7d6ce80b4..9b8dade936 100644 --- a/include/wx/setup_inc.h +++ b/include/wx/setup_inc.h @@ -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 // diff --git a/include/wx/string.h b/include/wx/string.h index 2e0e2423e2..53ae8907d8 100644 --- a/include/wx/string.h +++ b/include/wx/string.h @@ -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 diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h index d5aa2324ef..0239ce3ca3 100644 --- a/include/wx/textctrl.h +++ b/include/wx/textctrl.h @@ -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 diff --git a/include/wx/thread.h b/include/wx/thread.h index 7ee8361ee9..9b5ab4e2ef 100644 --- a/include/wx/thread.h +++ b/include/wx/thread.h @@ -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__ diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h index f59ae50558..bdac6a94a2 100644 --- a/include/wx/univ/setup0.h +++ b/include/wx/univ/setup0.h @@ -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 // diff --git a/include/wx/wxcrtbase.h b/include/wx/wxcrtbase.h index 2475ebfa95..406190292c 100644 --- a/include/wx/wxcrtbase.h +++ b/include/wx/wxcrtbase.h @@ -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 diff --git a/include/wx/wxcrtvararg.h b/include/wx/wxcrtvararg.h index c364def554..959f88fcc1 100644 --- a/include/wx/wxcrtvararg.h +++ b/include/wx/wxcrtvararg.h @@ -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 diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h index c283d10181..340404407e 100644 --- a/include/wx/wxprec.h +++ b/include/wx/wxprec.h @@ -17,7 +17,6 @@ #if defined(__VISUALC__) || \ defined(__DMC__) || \ defined(__VISAGECPP__) || \ - defined(__MWERKS__) || \ defined(__WATCOMC__) || \ defined(__BORLANDC__) diff --git a/interface/wx/debug.h b/interface/wx/debug.h index 2c03d20a45..7e787e88c4 100644 --- a/interface/wx/debug.h +++ b/interface/wx/debug.h @@ -317,7 +317,7 @@ void wxDisableAsserts(); Returns @true if the program is running under debugger, @false otherwise. Please note that this function is currently only implemented for Win32 and - Mac builds using CodeWarrior and always returns @false elsewhere. + always returns @false elsewhere. @header{wx/debug.h} */ diff --git a/interface/wx/textfile.h b/interface/wx/textfile.h index 0cee089cb3..72224cb233 100644 --- a/interface/wx/textfile.h +++ b/interface/wx/textfile.h @@ -145,9 +145,9 @@ public: @e typeDefault is the value defined during the compilation and corresponds to the native format of the platform, i.e. it will be @c wxTextFileType_Dos - under Windows, @c wxTextFileType_Unix under Unix (including Mac OS X when - compiling with the Apple Developer Tools) and @c wxTextFileType_Mac under - Mac OS (including Mac OS X when compiling with CodeWarrior). + under Windows and @c wxTextFileType_Unix under Unix (including Mac OS + X, the value @c wxTextFileType_Mac was only used for classic Mac OS + versions). */ static const wxChar* GetEOL(wxTextFileType type = typeDefault); diff --git a/src/common/file.cpp b/src/common/file.cpp index 2701cfcb41..bc6be8c1c4 100644 --- a/src/common/file.cpp +++ b/src/common/file.cpp @@ -460,7 +460,7 @@ bool wxFile::Eof() const wxFileOffset iRc; -#if defined(__DOS__) || defined(__UNIX__) || defined(__GNUWIN32__) || defined( __MWERKS__ ) +#if defined(__DOS__) || defined(__UNIX__) || defined(__GNUWIN32__) // @@ this doesn't work, of course, on unseekable file descriptors wxFileOffset ofsCur = Tell(), ofsMax = Length(); diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp index 100ca385dc..85a3cad29d 100644 --- a/src/common/filefn.cpp +++ b/src/common/filefn.cpp @@ -76,7 +76,7 @@ // io.h is needed for _get_osfhandle() // Already included by filefn.h for many Windows compilers - #if defined __MWERKS__ || defined __CYGWIN__ + #if defined __CYGWIN__ #include #endif #endif // __WINDOWS__ @@ -1191,8 +1191,7 @@ bool wxRemoveFile(const wxString& file) || defined(__BORLANDC__) \ || defined(__WATCOMC__) \ || defined(__DMC__) \ - || defined(__GNUWIN32__) \ - || (defined(__MWERKS__) && defined(__MSL__)) + || defined(__GNUWIN32__) int res = wxRemove(file); #elif defined(__WXMAC__) int res = unlink(file.fn_str()); diff --git a/src/common/filename.cpp b/src/common/filename.cpp index 5f693d07d2..bc4b31b23f 100644 --- a/src/common/filename.cpp +++ b/src/common/filename.cpp @@ -33,7 +33,7 @@ http://msdn.microsoft.com/en-us/library/aa365248(VS.85).aspx. - wxPATH_MAC: Mac OS 8/9 and Mac OS X under CodeWarrior 7 format, absolute file + wxPATH_MAC: Mac OS 8/9 only, not used any longer, absolute file names have the form volume:dir1:...:dirN:filename and the relative file names are either @@ -118,19 +118,6 @@ #include #endif -#ifdef __MWERKS__ -#ifdef __MACH__ -#include -#include -#include -#include -#else -#include -#include -#include -#endif -#endif - #ifdef __WATCOMC__ #include #include @@ -1001,7 +988,7 @@ static wxString wxCreateTempImpl( } #else // !HAVE_MKTEMP (includes __DOS__) // generate the unique file name ourselves - #if !defined(__DOS__) && (!defined(__MWERKS__) || defined(__DARWIN__) ) + #if !defined(__DOS__) path << (unsigned int)getpid(); #endif diff --git a/src/common/ftp.cpp b/src/common/ftp.cpp index d1bc22eeec..94875a9488 100644 --- a/src/common/ftp.cpp +++ b/src/common/ftp.cpp @@ -48,9 +48,7 @@ #include "wx/protocol/protocol.h" #include "wx/protocol/ftp.h" -#ifndef __MWERKS__ - #include -#endif +#include // ---------------------------------------------------------------------------- // constants diff --git a/src/common/memory.cpp b/src/common/memory.cpp index dd4da0d58f..7480718c9b 100644 --- a/src/common/memory.cpp +++ b/src/common/memory.cpp @@ -38,8 +38,7 @@ #include "wx/ioswrap.h" -#if !defined(__WATCOMC__) && !(defined(__VMS__) && ( __VMS_VER < 70000000 ) )\ - && !defined( __MWERKS__ ) +#if !defined(__WATCOMC__) && !(defined(__VMS__) && ( __VMS_VER < 70000000 ) ) #include #endif diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp index 0d8c33609b..ecee1e1770 100644 --- a/src/common/sckaddr.cpp +++ b/src/common/sckaddr.cpp @@ -37,9 +37,7 @@ #include #include - #if !defined(__MWERKS__) - #include - #endif + #include #endif // !WX_PRECOMP #include "wx/socket.h" diff --git a/src/common/string.cpp b/src/common/string.cpp index d92df7a08c..4798b67c9c 100644 --- a/src/common/string.cpp +++ b/src/common/string.cpp @@ -1169,12 +1169,6 @@ int wxString::CmpNoCase(const wxString& s) const #if wxUSE_UNICODE -#ifdef __MWERKS__ -#ifndef __SCHAR_MAX__ -#define __SCHAR_MAX__ 127 -#endif -#endif - wxString wxString::FromAscii(const char *ascii, size_t len) { if (!ascii || len == 0) diff --git a/src/common/textbuf.cpp b/src/common/textbuf.cpp index bc0e5e6dbd..8a736a2a92 100644 --- a/src/common/textbuf.cpp +++ b/src/common/textbuf.cpp @@ -35,17 +35,12 @@ // ---------------------------------------------------------------------------- // default type is the native one -// the native type under Mac OS X is: -// - Unix when compiling with the Apple Developer Tools (__UNIX__) -// - Mac when compiling with CodeWarrior (__WXMAC__) const wxTextFileType wxTextBuffer::typeDefault = #if defined(__WINDOWS__) || defined(__DOS__) wxTextFileType_Dos; #elif defined(__UNIX__) wxTextFileType_Unix; -#elif defined(__WXMAC__) - wxTextFileType_Mac; #elif defined(__OS2__) wxTextFileType_Os2; #else diff --git a/src/common/time.cpp b/src/common/time.cpp index ebc597d969..4a76dfac48 100644 --- a/src/common/time.cpp +++ b/src/common/time.cpp @@ -48,11 +48,6 @@ # endif #endif -#if defined(__MWERKS__) && defined(__WINDOWS__) -# undef HAVE_FTIME -# undef HAVE_GETTIMEOFDAY -#endif - #ifndef __WXWINCE__ #include #else @@ -72,10 +67,6 @@ #include #endif -#if defined(__MWERKS__) && wxUSE_UNICODE - #include -#endif - #if defined(__DJGPP__) || defined(__WINE__) #include #include @@ -223,10 +214,6 @@ int wxGetTimeZone() return WX_TIMEZONE; #elif defined(__BORLANDC__) || defined(__MINGW32__) || defined(__VISAGECPP__) return _timezone; - #elif defined(__MWERKS__) - // This is just plain wrong but apparently MetroWerks runtime didn't have - // any way to get the time zone. - return 28800; #else // unknown platform -- assume it has timezone return timezone; #endif // different time zone variables diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp index fe29bc8a5a..1dae85d7f0 100644 --- a/src/common/utilscmn.cpp +++ b/src/common/utilscmn.cpp @@ -86,7 +86,7 @@ #include "wx/osx/private.h" #endif -#if !defined(__MWERKS__) && !defined(__WXWINCE__) +#if !defined(__WXWINCE__) #include #include #endif diff --git a/src/common/variant.cpp b/src/common/variant.cpp index 5f7daabe9a..6bafda604f 100644 --- a/src/common/variant.cpp +++ b/src/common/variant.cpp @@ -37,11 +37,6 @@ #endif #endif -#if defined(__MWERKS__) && __MSL__ >= 0x6000 -namespace std {} -using namespace std ; -#endif - #if wxUSE_STREAMS #include "wx/txtstrm.h" #endif diff --git a/src/common/wxcrt.cpp b/src/common/wxcrt.cpp index 2c8fb733d0..de9012b6d5 100644 --- a/src/common/wxcrt.cpp +++ b/src/common/wxcrt.cpp @@ -67,11 +67,6 @@ #define wxSET_ERRNO(value) errno = value #endif -#if defined(__MWERKS__) && __MSL__ >= 0x6000 -namespace std {} -using namespace std ; -#endif - #if defined(__DARWIN__) #include "wx/osx/core/cfref.h" #include @@ -99,12 +94,12 @@ WXDLLIMPEXP_BASE size_t wxMB2WC(wchar_t *buf, const char *psz, size_t n) #endif } - // note that we rely on common (and required by Unix98 but unfortunately not + // Note that we rely on common (and required by Unix98 but unfortunately not // C99) extension which allows to call mbs(r)towcs() with NULL output pointer // to just get the size of the needed buffer -- this is needed as otherwise - // we have no idea about how much space we need and if the CRT doesn't - // support it (the only currently known example being Metrowerks, see - // wx/crt.h) we don't use its mbstowcs() at all + // we have no idea about how much space we need. Currently all supported + // compilers do provide it and if they don't, HAVE_WCSRTOMBS shouldn't be + // defined at all. #ifdef HAVE_WCSRTOMBS return mbsrtowcs(NULL, &psz, 0, &mbstate); #else diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp index 8e7da47eb4..8d7e4985f8 100644 --- a/src/generic/logg.cpp +++ b/src/generic/logg.cpp @@ -69,10 +69,6 @@ #include "wx/image.h" #endif // wxUSE_LOG_DIALOG/!wxUSE_LOG_DIALOG -#if defined(__MWERKS__) && wxUSE_UNICODE - #include -#endif - #include "wx/time.h" // the suffix we add to the button to show that the dialog can be expanded diff --git a/src/jpeg/jconfig.h b/src/jpeg/jconfig.h index bd5f5db9fa..c8afdeb56e 100644 --- a/src/jpeg/jconfig.h +++ b/src/jpeg/jconfig.h @@ -6,39 +6,9 @@ /* jconfig.cfg --- source file edited by configure script */ /* see jconfig.doc for explanations */ -/* If using MetroWerks on Mac define __WXMAC__ if it isn't already - FIXME: Is this necessary any longer? */ -#ifdef __MWERKS__ -#if (__MWERKS__ < 0x0900) || macintosh || defined ( __MACH__ ) -# ifndef __WXMAC__ -# define __WXMAC__ -# endif -#endif -#endif - /* use wxWidgets' configure */ #include "wx/setup.h" -/* If using Metrowerks and not using configure-generated setup */ -#if defined(__MWERKS__) && !defined(__WX_SETUP_H__) -#if (__MWERKS__ < 0x0900) || macintosh || defined ( __MACH__ ) - -# define USE_MAC_MEMMGR - -# ifdef __MACH__ -# include -# include -# include -# undef WCHAR_MAX -# include -# endif - -/* automatically includes MacHeaders */ -#elif (__MWERKS__ >= 0x0900) && __INTEL__ - #define __WXMSW__ -#endif -#endif - #define HAVE_PROTOTYPES #define HAVE_UNSIGNED_CHAR #define HAVE_UNSIGNED_SHORT diff --git a/src/msw/dib.cpp b/src/msw/dib.cpp index 4eff321612..00faac6a4e 100644 --- a/src/msw/dib.cpp +++ b/src/msw/dib.cpp @@ -45,9 +45,7 @@ #include #include -#if !defined(__MWERKS__) - #include -#endif +#include #include "wx/msw/dib.h" diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp index 156605e408..b1d1e0e8aa 100644 --- a/src/msw/ole/dataobj.cpp +++ b/src/msw/ole/dataobj.cpp @@ -465,8 +465,7 @@ STDMETHODIMP wxIDataObject::SetData(FORMATETC *pformatetc, break; #if !(defined(__BORLANDC__) && (__BORLANDC__ < 0x500)) case CF_UNICODETEXT: -#if ( defined(__BORLANDC__) && (__BORLANDC__ > 0x530) ) \ - || ( defined(__MWERKS__) && defined(__WXMSW__) ) +#if ( defined(__BORLANDC__) && (__BORLANDC__ > 0x530) ) size = std::wcslen((const wchar_t *)pBuf) * sizeof(wchar_t); #else size = wxWcslen((const wchar_t *)pBuf) * sizeof(wchar_t); diff --git a/src/msw/ole/oleutils.cpp b/src/msw/ole/oleutils.cpp index fbfae3a5d9..9235049632 100644 --- a/src/msw/ole/oleutils.cpp +++ b/src/msw/ole/oleutils.cpp @@ -400,7 +400,7 @@ wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant) #if wxUSE_DATAOBJ -#if wxDEBUG_LEVEL && ( ( defined(__VISUALC__) && (__VISUALC__ > 1000) ) || defined(__MWERKS__) ) +#if wxDEBUG_LEVEL && (( defined(__VISUALC__) && (__VISUALC__ > 1000) )) static wxString GetIidName(REFIID riid) { // an association between symbolic name and numeric value of an IID @@ -417,7 +417,7 @@ static wxString GetIidName(REFIID riid) ADD_KNOWN_IID(AdviseSink2), ADD_KNOWN_IID(BindCtx), ADD_KNOWN_IID(ClassFactory), -#if ( !defined( __VISUALC__) || (__VISUALC__!=1010) ) && !defined(__MWERKS__) +#if ( !defined( __VISUALC__) || (__VISUALC__!=1010) ) ADD_KNOWN_IID(ContinueCallback), ADD_KNOWN_IID(EnumOleDocumentViews), ADD_KNOWN_IID(OleCommandTarget), diff --git a/src/msw/thread.cpp b/src/msw/thread.cpp index d57bbb9b0f..3aaeb7d0f3 100644 --- a/src/msw/thread.cpp +++ b/src/msw/thread.cpp @@ -64,7 +64,7 @@ #if defined(__VISUALC__) || \ (defined(__BORLANDC__) && (__BORLANDC__ >= 0x500)) || \ (defined(__GNUG__) && defined(__MSVCRT__)) || \ - defined(__WATCOMC__) || defined(__MWERKS__) + defined(__WATCOMC__) #ifndef __WXWINCE__ #undef wxUSE_BEGIN_THREAD diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp index 703a65ae20..9c2d759051 100644 --- a/src/msw/utils.cpp +++ b/src/msw/utils.cpp @@ -60,9 +60,7 @@ #if !defined(__GNUWIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__) #include - #ifndef __MWERKS__ - #include - #endif + #include #endif //GNUWIN32 #if defined(__CYGWIN__) diff --git a/src/msw/utilsexc.cpp b/src/msw/utilsexc.cpp index 3fdf3b9aad..734ca45d11 100644 --- a/src/msw/utilsexc.cpp +++ b/src/msw/utilsexc.cpp @@ -48,10 +48,8 @@ #if !defined(__GNUWIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__) #include -#ifndef __MWERKS__ #include #endif -#endif #if defined(__GNUWIN32__) #include diff --git a/src/osx/carbon/graphics.cpp b/src/osx/carbon/graphics.cpp index b4b01cfaf8..afaec66fa4 100644 --- a/src/osx/carbon/graphics.cpp +++ b/src/osx/carbon/graphics.cpp @@ -113,11 +113,9 @@ extern "C" // constants //----------------------------------------------------------------------------- -#if !defined( __DARWIN__ ) || defined(__MWERKS__) #ifndef M_PI const double M_PI = 3.14159265358979; #endif -#endif static const double RAD2DEG = 180.0 / M_PI; diff --git a/src/osx/carbon/utils.cpp b/src/osx/carbon/utils.cpp index e95ceaa8ff..f70317895f 100644 --- a/src/osx/carbon/utils.cpp +++ b/src/osx/carbon/utils.cpp @@ -45,12 +45,6 @@ #include "wx/evtloop.h" -#if defined(__MWERKS__) && wxUSE_UNICODE -#if __MWERKS__ < 0x4100 - #include -#endif -#endif - #if wxUSE_BASE // Emit a beeeeeep diff --git a/src/osx/utils_osx.cpp b/src/osx/utils_osx.cpp index e1765e81d1..1f09af498f 100644 --- a/src/osx/utils_osx.cpp +++ b/src/osx/utils_osx.cpp @@ -44,12 +44,6 @@ #include "wx/evtloop.h" -#if defined(__MWERKS__) && wxUSE_UNICODE -#if __MWERKS__ < 0x4100 - #include -#endif -#endif - // Check whether this window wants to process messages, e.g. Stop button // in long calculations. bool wxCheckForInterrupt(wxWindow *WXUNUSED(wnd)) diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp index ec550fcf24..6a7fcd27be 100644 --- a/src/unix/utilsunx.cpp +++ b/src/unix/utilsunx.cpp @@ -69,26 +69,6 @@ #endif // HAS_PIPE_STREAMS -#if defined(__MWERKS__) && defined(__MACH__) - #ifndef WXWIN_OS_DESCRIPTION - #define WXWIN_OS_DESCRIPTION "MacOS X" - #endif - #ifndef HAVE_NANOSLEEP - #define HAVE_NANOSLEEP - #endif - #ifndef HAVE_UNAME - #define HAVE_UNAME - #endif - - // our configure test believes we can use sigaction() if the function is - // available but Metrowekrs with MSL run-time does have the function but - // doesn't have sigaction struct so finally we can't use it... - #ifdef __MSL__ - #undef wxUSE_ON_FATAL_EXCEPTION - #define wxUSE_ON_FATAL_EXCEPTION 0 - #endif -#endif - // not only the statfs syscall is called differently depending on platform, but // one of its incarnations, statvfs(), takes different arguments under // different platforms and even different versions of the same system (Solaris diff --git a/tests/archive/archivetest.cpp b/tests/archive/archivetest.cpp index bbe235d850..d6ac25692b 100644 --- a/tests/archive/archivetest.cpp +++ b/tests/archive/archivetest.cpp @@ -51,9 +51,6 @@ using std::auto_ptr; #if defined __DMC__ && __DMC__ >= 0x832 # define WXARC_MEMBER_TEMPLATES #endif -#if defined __MWERKS__ && __MWERKS__ >= 0x2200 -# define WXARC_MEMBER_TEMPLATES -#endif #if defined __HP_aCC && __HP_aCC > 33300 # define WXARC_MEMBER_TEMPLATES #endif -- 2.45.2