blind attempt to fix wxMac compilation (__UNIX__ defined on OS X?)

[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 275e130219ba9f182b05667b2768da2ee0e0e128..94d5dd1741efa3a2af319f1584a219b8cef1c07e 100644 (file)
--- a/include/wx/wx_cw_d.h
+++ b/include/wx/wx_cw_d.h
@@ -12,49 +12,35 @@
 #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>
-//             #include <Windows.h>
-//             #include <COMMCTRL.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
 

-#define __WXDEBUG__
-#define USE_DEFINE
-// in order to avoid problems further down in wxWindows
-
+#if __option(profile)
+#error "profiling is not supported in debug versions"
+#else

 #ifdef __cplusplus
 #ifdef __cplusplus

-extern "C" 
-{
+       #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

-       char *strdup(const char *s) ;
-       int     isascii( int c ) ;
-#ifdef __cplusplus
-} ;

 #endif
 #endif

+

 #endif
     // _WX_CW__
 #endif
     // _WX_CW__