CodeWarrior Support

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1160 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 06da9d41aab181ea1789a2cfe0607108f95f2090..754bff6b3c6280c8570ca10237d165f2635a4205 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -104,7 +104,7 @@
 // VC++ 4.0 is 1000.
 
 // Add more tests here for compilers that don't already define bool.
 // VC++ 4.0 is 1000.
 
 // Add more tests here for compilers that don't already define bool.

-#if ( defined(_MSC_VER) && (_MSC_VER <= 1000) ) || (defined(__BORLANDC__) && (__BORLANDC__ < 0x500))
+#if ( defined(_MSC_VER) && (_MSC_VER <= 1000) && !defined( __MWERKS__ ) ) || (defined(__BORLANDC__) && (__BORLANDC__ < 0x500)) || ( __MWERKS__ < 0x1000 || !__option(bool) )

 typedef unsigned int bool;
 #endif
 
 typedef unsigned int bool;
 #endif
 

diff --git a/include/wx/memory.h b/include/wx/memory.h
index b12620c655553f1f9c5ba55394127409f5948a5e..664db4e2889cfce370874d9d4d24e21d3ff022a6 100644 (file)
--- a/include/wx/memory.h
+++ b/include/wx/memory.h
@@ -56,14 +56,14 @@ void wxDebugFree(void * buf, bool isVect = FALSE);
 // Added JACS 25/11/98: needed for some compilers
 void * operator new (size_t size);
 
 // Added JACS 25/11/98: needed for some compilers
 void * operator new (size_t size);
 

-#if !( defined (_MSC_VER) && (_MSC_VER <= 1020) )
+#if !( defined (_MSC_VER) && (_MSC_VER <= 1020) ) || defined( __MWERKS__)

 void * operator new[] (size_t size);
 #endif
 
 void * operator new (size_t size, char * fileName, int lineNum);
 void operator delete (void * buf);
 
 void * operator new[] (size_t size);
 #endif
 
 void * operator new (size_t size, char * fileName, int lineNum);
 void operator delete (void * buf);
 

-#if !( defined (_MSC_VER) && (_MSC_VER <= 1020) )
+#if !( defined (_MSC_VER) && (_MSC_VER <= 1020) ) || defined( __MWERKS__)

 void * operator new[] (size_t size, char * fileName, int lineNum);
 void operator delete[] (void * buf);
 #endif
 void * operator new[] (size_t size, char * fileName, int lineNum);
 void operator delete[] (void * buf);
 #endif

diff --git a/include/wx/object.h b/include/wx/object.h
index 2791952dcb5a6aa7370017362ce1a23eda69a073..b8051a90a3aa7cd94a9af8b5bf4e7beef26b5313 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -190,18 +190,23 @@ class WXDLLEXPORT wxObject
 #if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING
   void * operator new (size_t size, char * fileName = NULL, int lineNum = 0);
   void operator delete (void * buf);
 #if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING
   void * operator new (size_t size, char * fileName = NULL, int lineNum = 0);
   void operator delete (void * buf);

-  
+

 // VC++ 6.0
 #if _MSC_VER >= 1200
   void operator delete(void *buf, char*, int);
 #endif
 
   // Cause problems for VC++
 // VC++ 6.0
 #if _MSC_VER >= 1200
   void operator delete(void *buf, char*, int);
 #endif
 
   // Cause problems for VC++

-#ifndef _MSC_VER
+#ifndef _MSC_VER 

   void * operator new[] (size_t size, char * fileName = NULL, int lineNum = 0);
   void operator delete[] (void * buf);
 #endif
 
   void * operator new[] (size_t size, char * fileName = NULL, int lineNum = 0);
   void operator delete[] (void * buf);
 #endif
 

+#ifdef __MWERKS__
+  void * operator new[] (size_t size, char * fileName  , int lineNum = 0);
+  void operator delete[] (void * buf);
+#endif
+

 #endif
 
 #if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
 #endif
 
 #if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT