another DMC build fix (http://thread.gmane.org/gmane.comp.lib.wxwidgets.devel/93155)

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

diff --git a/include/wx/wx_cw.h b/include/wx/wx_cw.h
index 7702030a3d390ada1975abd0186ed5897381f9a6..2c902ecf5e83cd9b4ad60c50994356deeff74202 100644 (file)
--- a/include/wx/wx_cw.h
+++ b/include/wx/wx_cw.h
@@ -1,48 +1,65 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx_cw.h
 /////////////////////////////////////////////////////////////////////////////
 // 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
 // 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__
 /////////////////////////////////////////////////////////////////////////////
 
 #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 
-
-#define WX_COMP_INLINE_NO_CLASS // defined if the compiler does not want the classname repeated for inlines within a class definition
-
-#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>
-#elif __BEOS__
-    #include <ansi_prefix.be.h>
-    #include <Be.h>
-#else  
-    #error unknown MW compiler
+#if __MWERKS__ >= 0x2400
+#pragma old_argmatch on

 #endif
 
 #endif
 

-// in order to avoid problems further down in wxWindows
-
-char *strdup(const char *s) ;
-
+#if __option(profile)
+#ifdef __cplusplus
+    #if __POWERPC__
+        #include <wx_PPC++_prof.mch>
+    #elif __INTEL__
+        #include <wx_x86++_prof.mch>
+    #elif __CFM68K__
+        #include <wx_cfm++_prof.mch>
+    #else
+        #include <wx_68k++_prof.mch>
+    #endif
+#else
+    #if __POWERPC__
+        #include <wx_PPC_prof.mch>
+    #elif __INTEL__
+        #include <wx_x86_prof.mch>
+    #elif __CFM68K__
+        #include <wx_cfm_prof.mch>
+    #else
+        #include <wx_68k_prof.mch>
+    #endif
+#endif
+#else
+#ifdef __cplusplus
+    #if __POWERPC__
+        #include <wx_PPC++.mch>
+    #elif __INTEL__
+        #include <wx_x86++.mch>
+    #elif __CFM68K__
+        #include <wx_cfm++.mch>
+    #else
+        #include <wx_68k++.mch>
+    #endif
+#else
+    #if __POWERPC__
+        #include <wx_PPC.mch>
+    #elif __INTEL__
+        #include <wx_x86.mch>
+    #elif __CFM68K__
+        #include <wx_cfm.mch>
+    #else
+        #include <wx_68k.mch>
+    #endif
+#endif
+#endif

 #endif
     // _WX_CW__
 #endif
     // _WX_CW__