InitAsNeeded no longer inline in the header.

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

diff --git a/include/wx/wx_cw_d.h b/include/wx/wx_cw_d.h
index 24db04b37378047823baacddcd42fc3bc0f0af77..ef13968623f609fef2496b4af9ca51a56af270e2 100644 (file)
--- a/include/wx/wx_cw_d.h
+++ b/include/wx/wx_cw_d.h
@@ -12,41 +12,35 @@
 #ifndef _WX_CW__
 #define _WX_CW__
 
-#define MSL_USE_PRECOMPILED_HEADERS    1
-
-#if !defined( __MWERKS__ )
-       #error "this file is only for builds with Metrowerks CodeWarrior"
-#endif 
-
-#if (__MWERKS__ < 0x0900) || macintosh
-       #define __MAC__
-       #define __WXMAC__
-       #define USE_PRECOMPILED_MAC_HEADERS     1  /*Set to 0 if you don't want to use precompiled MacHeaders*/
-       #include <ansi_prefix.mac.h>
-       #define WX_PRECOMP
-       // automatically includes MacHeaders
-#elif (__MWERKS__ >= 0x0900) && __INTEL__
-       #define __WXMSW__
-       #define __WINDOWS__
-       #define __WIN95__
-       #define STRICT
-       #define NOMINMAX
-       #include <ansi_prefix.win32.h>
-//             #include <Windows.h>
-//             #include <COMMCTRL.H>
-#elif __BEOS__
-       #include <ansi_prefix.be.h>
-       #include <Be.h>
-#else  
-       #error unknown MW compiler
+#if __MWERKS__ >= 0x2400 && __MWERKS__ < 0x3200
+#pragma old_argmatch on
 #endif
 
-#define __WXDEBUG__ 1
-#define WXDEBUG 1
-
-// in order to avoid problems further down in wxWindows
-
-char *strdup(const char *s) ;
+#if __option(profile)
+#error "profiling is not supported in debug versions"
+#else
+#ifdef __cplusplus
+       #if __POWERPC__
+               #include <wx_PPC++_d.mch>
+       #elif __INTEL__
+               #include <wx_x86++_d.mch>
+       #elif __CFM68K__
+               #include <wx_cfm++_d.mch>
+       #else
+               #include <wx_68k++_d.mch>
+       #endif
+#else
+       #if __POWERPC__
+               #include <wx_PPC_d.mch>
+       #elif __INTEL__
+               #include <wx_x86_d.mch>
+       #elif __CFM68K__
+               #include <wx_cfm_d.mch>
+       #else
+               #include <wx_68k_d.mch>
+       #endif
+#endif
+#endif
 
 #endif
     // _WX_CW__