Layout fixes due to measuring with the wrong font. Also added

[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 dd2c3fa06c5fcc4b8f98af0af2e26e6ac1a8a373..77ae654deeb08efc03aa3ecc539bfe7f858636ed 100644 (file)
--- a/include/wx/wx_cw_cm.h
+++ b/include/wx/wx_cw_cm.h
@@ -1,20 +1,29 @@
-#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"
 #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
+#if __MWERKS__ >= 0x2400 && __MWERKS__ <= 0x3200
+#pragma old_argmatch on
+#endif
+
+#if (__MWERKS__ < 0x0900) || macintosh || __MACH__
     #define __MAC__
     #define __WXMAC__
-    #define    USE_PRECOMPILED_MAC_HEADERS     1  /*Set to 0 if you don't want to use precompiled MacHeaders*/
-// automatically includes MacHeaders
 #elif (__MWERKS__ >= 0x0900) && __INTEL__
+    #define WIN32
+    #define _WINDOWS
     #define __WXMSW__
     #define __WINDOWS__
     #define __WIN95__
+    #define __WIN32__
     #define STRICT
     #define NOMINMAX
 #elif __BEOS__
@@ -27,25 +36,48 @@
 #ifdef __WXMSW__
     #include <ansi_prefix.win32.h>
     #include <ansi_parms.h>
-    #if defined( __MSL__ ) && __MSL__ >= 0x5012
+    #ifdef __MWERKS__
+    #if defined( __MSL__ ) && __MSL__ >= 0x5012 && __MSL__ < 0x7000
                        #define fileno  _fileno
                        #define fdopen  _fdopen
                        #define tell    _tell
     #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
-// in order to avoid problems further down in wxWindows
+
+// in order to avoid problems further down in wxWidgets
 
 #ifdef __cplusplus
+
 extern "C" 
 {
 #endif
        char *strdup(const char *s) ;
        int     isascii( int c ) ;
 #ifdef __cplusplus
-} ;
+}
 #endif