don't use border styles for windows in wxUniversal

[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 a6c9255d8c2a0c5ac4eebce4421f8e4793c1a4ce..890b3c0a063af689828e69d588449bb78a4f2755 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"
 
 #if !defined( __MWERKS__ )
     #error "this file is only for builds with Metrowerks CodeWarrior"


@@ -13,24 +13,6 @@
 #if (__MWERKS__ < 0x0900) || macintosh
     #define __MAC__
     #define __WXMAC__
 #if (__MWERKS__ < 0x0900) || macintosh
     #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*/
-               #include "MacHeaders.c"
-               #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 
-                       #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__
     #define __WXMSW__
     #define __WINDOWS__
 #elif (__MWERKS__ >= 0x0900) && __INTEL__
     #define __WXMSW__
     #define __WINDOWS__


@@ -55,7 +37,21 @@
     #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
+         #ifdef __WXDEBUG__
+         // otherwise the debugger looses all symbol information
+    #define OPAQUE_TOOLBOX_STRUCTS 0
+         #else
+    #define OPAQUE_TOOLBOX_STRUCTS 1
+    #endif
+      #include <ansi_prefix.mac.h>
+      /*
+      #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