Added __WXMAC_OSX__ guards around the CFRunLoop calls, CFRunLoop not available on...

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

diff --git a/include/wx/wx_cw_cm.h b/include/wx/wx_cw_cm.h
index 2fe7cf96783d286a3296d5964489bacff194b0f0..a577e2860c5a10020f0e3fbce59a988bbf0110f4 100644 (file)
--- a/include/wx/wx_cw_cm.h
+++ b/include/wx/wx_cw_cm.h
@@ -1,35 +1,35 @@
-#define MSL_USE_PRECOMPILED_HEADERS    1
-
+#define MSL_USE_PRECOMPILED_HEADERS 0
+#if __WXDEBUG__
+    // mac os assert levels
+    #define DEBUG 1
+    #define DEBUG_INTERNAL 1
+#endif

 #if !defined( __MWERKS__ )
     #error "this file is only for builds with Metrowerks CodeWarrior"
 #if !defined( __MWERKS__ )
     #error "this file is only for builds with Metrowerks CodeWarrior"

-#endif 
+#endif

 
 #define WX_COMP_INLINE_NO_CLASS // defined if the compiler does not want the classname repeated for inlines within a class definition
 
 
 #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
+#if __MWERKS__ >= 0x2400 && __MWERKS__ <= 0x3200
+#pragma old_argmatch on
+#endif
+
+#if (__MWERKS__ < 0x0900) || macintosh || __MACH__

     #define __MAC__
     #define __WXMAC__
     #define __MAC__
     #define __WXMAC__

-    #if TARGET_CARBON
-           #define     USE_PRECOMPILED_MAC_HEADERS     0  /*Set to 0 if you don't want to use precompiled MacHeaders*/
-                       #ifdef __cplusplus
-                                       #include <MacHeadersPPCX++>
-                       #else
-                                       #include <MacHeadersPPCX>
-                       #endif
-               #else
-           #define     USE_PRECOMPILED_MAC_HEADERS     1  /*Set to 0 if you don't want to use precompiled MacHeaders*/
-               #endif
-// automatically includes MacHeaders

 #elif (__MWERKS__ >= 0x0900) && __INTEL__
 #elif (__MWERKS__ >= 0x0900) && __INTEL__

+    #define WIN32
+    #define _WINDOWS

     #define __WXMSW__
     #define __WINDOWS__
     #define __WIN95__
     #define __WXMSW__
     #define __WINDOWS__
     #define __WIN95__

+    #define __WIN32__

     #define STRICT
     #define NOMINMAX
 #elif __BEOS__
     #include <ansi_prefix.be.h>
     #include <Be.h>
     #define STRICT
     #define NOMINMAX
 #elif __BEOS__
     #include <ansi_prefix.be.h>
     #include <Be.h>

-#else  
+#else

     #error unknown MW compiler
 #endif
 
     #error unknown MW compiler
 #endif
 


@@ -37,28 +37,34 @@
     #include <ansi_prefix.win32.h>
     #include <ansi_parms.h>
     #ifdef __MWERKS__
     #include <ansi_prefix.win32.h>
     #include <ansi_parms.h>
     #ifdef __MWERKS__

-    #if defined( __MSL__ ) && __MSL__ >= 0x5012
-                       #define fileno  _fileno
-                       #define fdopen  _fdopen
-                       #define tell    _tell
+    #if defined( __MSL__ ) && __MSL__ >= 0x5012 && __MSL__ < 0x7000
+            #define fileno _fileno
+            #define fdopen _fdopen
+            #define tell   _tell

     #endif
     #endif
 #elif defined( __WXMAC__)
     #endif
     #endif
 #elif defined( __WXMAC__)

-    #include <ansi_prefix.mac.h>
+    #define USE_PRECOMPILED_MAC_HEADERS  0  /*Set to 0 if you don't want to use precompiled MacHeaders*/
+    #define ACCESSOR_CALLS_ARE_FUNCTIONS 1
+    #define OPAQUE_TOOLBOX_STRUCTS 1
+    #ifdef __MACH__
+        #include <ansi_prefix.mach.h>
+        #include <msl_c_version.h>
+        #include <stdint.h>
+        #undef WCHAR_MAX
+        #include <machine/ansi.h>
+    #else
+      #include <ansi_prefix.mac.h>
+    #endif
+    // for getting the correct expat includes
+    #define MACOS_CLASSIC
+    /*
+    #include <MacTypes.h>
+    #if UNIVERSAL_INTERFACES_VERSION < 0x0340
+        #error "please update to Apple's lastest universal headers from http://developer.apple.com/sdk/"
+    #endif
+    */

 #endif
 
 #define USE_DEFINE
 
 #endif
 
 #define USE_DEFINE
 

-// in order to avoid problems further down in wxWindows
-
-#ifdef __cplusplus
-
-extern "C" 
-{
-#endif
-       char *strdup(const char *s) ;
-       int     isascii( int c ) ;
-#ifdef __cplusplus
-} ;
-#endif
-