use global operator new to fix compilation errors if type T overloads new (as wxObjec...

[wxWidgets.git] / include / wx / wx_cwc.h

diff --git a/include/wx/wx_cwc.h b/include/wx/wx_cwc.h
index ea8911edf0d86bc3a51ba9eb3e8e205eaa29ee07..0430251bd514a45f58ff5b6eb1525908abd71e3f 100644 (file)
--- a/include/wx/wx_cwc.h
+++ b/include/wx/wx_cwc.h
@@ -1,40 +1,48 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx_cw.h
-// Purpose:     wxWindows definitions for CodeWarrior builds
+// Purpose:     wxWidgets definitions for CodeWarrior builds
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     12/10/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CW__
 #define _WX_CW__
 
-#if __MWERKS__ >= 0x2400
-#pragma old_argmatch on
+#if __MWERKS__ >= 0x2400 && __MWERKS__ < 0x3200
+    #pragma old_argmatch on
 #endif
 
 #if __option(profile)
 #ifdef __cplusplus
-       #if __POWERPC__
-               #include <wx_Carbon++_prof.mch>
-       #endif
+    #ifdef __MACH__
+        #include "wx_Mach++_prof.mch"
+    #elif __POWERPC__
+        #include "wx_Carbon++_prof.mch"
+    #endif
 #else
-       #if __POWERPC__
-               #include <wx_Carbon_prof.mch>
-       #endif
+    #ifdef __MACH__
+        #include "wx_Mach_prof.mch"
+    #elif __POWERPC__
+        #include "wx_Carbon_prof.mch"
+    #endif
 #endif
 #else
 #ifdef __cplusplus
-       #if __POWERPC__
-               #include <wx_Carbon++.mch>
-       #endif
+    #ifdef __MACH__
+        #include "wx_Mach++.mch"
+    #elif __POWERPC__
+        #include "wx_Carbon++.mch"
+    #endif
 #else
-       #if __POWERPC__
-               #include <wx_Carbon.mch>
-       #endif
+    #ifdef __MACH__
+        #include "wx_Mach.mch"
+    #elif __POWERPC__
+        #include "wx_Carbon.mch"
+    #endif
 #endif
 #endif
 #endif