X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5273bf2fd3292ec3ab3da4f0c197b2f0e93df32e..99ab3e3f56ab43fe1127eb565cad1a619cad0499:/include/wx/wx_cw_cm.h

diff --git a/include/wx/wx_cw_cm.h b/include/wx/wx_cw_cm.h
index 4143e251c9..c5dd9aef7a 100644
--- a/include/wx/wx_cw_cm.h
+++ b/include/wx/wx_cw_cm.h
@@ -14,9 +14,12 @@
     #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,17 +33,23 @@
     #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*/
-	  #define ACCESSOR_CALLS_ARE_FUNCTIONS 1
-    #define OPAQUE_TOOLBOX_STRUCTS 1
-      #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
+        // enabling opaque toolbox structs under Classic will break access to contrlDefProc (control.cpp)
+        // #define OPAQUE_TOOLBOX_STRUCTS 1
+    #endif
+    #include <ansi_prefix.mac.h>
       /*
       #include <MacTypes.h>
 		#if UNIVERSAL_INTERFACES_VERSION < 0x0340
@@ -61,6 +70,6 @@ extern "C"
 	char *strdup(const char *s) ;
 	int	isascii( int c ) ;
 #ifdef __cplusplus
-} ;
+}
 #endif