Applied [ 799292 ] wxWizard and Validator Bug and Fix

[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 6221f0e57b1e6da0abd1932b835512b141d609fb..581bb4f3bb5238bbf4fddd53f6179f05e998420c 100644 (file)
--- a/include/wx/wx_cw_cm.h
+++ b/include/wx/wx_cw_cm.h
@@ -1,4 +1,4 @@
-#define MSL_USE_PRECOMPILED_HEADERS    1
+#define MSL_USE_PRECOMPILED_HEADERS    0
 
 #if !defined( __MWERKS__ )
     #error "this file is only for builds with Metrowerks CodeWarrior"
@@ -10,13 +10,16 @@
 #pragma old_argmatch on
 #endif
 
-#if (__MWERKS__ < 0x0900) || macintosh
+#if (__MWERKS__ < 0x0900) || macintosh || __MACH__
     #define __MAC__
     #define __WXMAC__
 #elif (__MWERKS__ >= 0x0900) && __INTEL__
+    #define WIN32
+    #define _WINDOWS
     #define __WXMSW__
     #define __WINDOWS__
     #define __WIN95__
+    #define __WIN32__
     #define STRICT
     #define NOMINMAX
 #elif __BEOS__
@@ -30,19 +33,38 @@
     #include <ansi_prefix.win32.h>
     #include <ansi_parms.h>
     #ifdef __MWERKS__
-    #if defined( __MSL__ ) && __MSL__ >= 0x5012
+    #if defined( __MSL__ ) && __MSL__ >= 0x5012 && __MSL__ < 0x7000
                        #define fileno  _fileno
                        #define fdopen  _fdopen
                        #define tell    _tell
     #endif
     #endif
 #elif defined( __WXMAC__)
-         #define       USE_PRECOMPILED_MAC_HEADERS     0  /*Set to 0 if you don't want to use precompiled MacHeaders*/
-               #include "MacHeaders.c"
-    #include <ansi_prefix.mac.h>
-               #if UNIVERSAL_INTERFACES_VERSION < 0x0340
-                   #error "please update to Apple's lastest universal headers from http://developer.apple.com/sdk/"
-               #endif
+    #define    USE_PRECOMPILED_MAC_HEADERS     0  /*Set to 0 if you don't want to use precompiled MacHeaders*/
+    #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
+    #endif
+    #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
@@ -57,6 +79,6 @@ extern "C"
        char *strdup(const char *s) ;
        int     isascii( int c ) ;
 #ifdef __cplusplus
-} ;
+}
 #endif