wxPalmOS was introduced long after 2.4.

[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 21aa30cbab4e4446c0418f9be83e42a028690aef..a577e2860c5a10020f0e3fbce59a988bbf0110f4 100644 (file)
--- a/include/wx/wx_cw_cm.h
+++ b/include/wx/wx_cw_cm.h
@@ -1,12 +1,16 @@
-#define MSL_USE_PRECOMPILED_HEADERS    0
-
+#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__ >= 0x2400
+#if __MWERKS__ >= 0x2400 && __MWERKS__ <= 0x3200

 #pragma old_argmatch on
 #endif
 
 #pragma old_argmatch on
 #endif
 


@@ -25,7 +29,7 @@
 #elif __BEOS__
     #include <ansi_prefix.be.h>
     #include <Be.h>
 #elif __BEOS__
     #include <ansi_prefix.be.h>
     #include <Be.h>

-#else  
+#else

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


@@ -34,49 +38,33 @@
     #include <ansi_parms.h>
     #ifdef __MWERKS__
     #if defined( __MSL__ ) && __MSL__ >= 0x5012 && __MSL__ < 0x7000
     #include <ansi_parms.h>
     #ifdef __MWERKS__
     #if defined( __MSL__ ) && __MSL__ >= 0x5012 && __MSL__ < 0x7000

-                       #define fileno  _fileno
-                       #define fdopen  _fdopen
-                       #define tell    _tell
+            #define fileno _fileno
+            #define fdopen _fdopen
+            #define tell   _tell

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

-    #define    USE_PRECOMPILED_MAC_HEADERS     0  /*Set to 0 if you don't want to use precompiled MacHeaders*/
+    #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 ACCESSOR_CALLS_ARE_FUNCTIONS 1

-         #if defined( __WXDEBUG__ ) && !defined(__MACH__)
-        // otherwise the debugger looses all symbol information
-        #define OPAQUE_TOOLBOX_STRUCTS 0
-         #else

     #define OPAQUE_TOOLBOX_STRUCTS 1
     #define OPAQUE_TOOLBOX_STRUCTS 1

-    #endif

     #ifdef __MACH__
     #ifdef __MACH__

-         #include <ansi_prefix.mach.h>
-         #include <msl_c_version.h>
-         #include <stdint.h>
-         #undef WCHAR_MAX
-         #include <machine/ansi.h>
+        #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
     #else
       #include <ansi_prefix.mac.h>
     #endif

-      /*
-      #include <MacTypes.h>
-               #if UNIVERSAL_INTERFACES_VERSION < 0x0340
-                   #error "please update to Apple's lastest universal headers from http://developer.apple.com/sdk/"
-               #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
-