restored wxPluginLibrary::ms_classes handling code that was removed by mistake

[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 c5dd9aef7abb8b82ab7eb982fd05ef3ab395cf2c..127bbbc0f1f1fef5e9d7cdf036faf023609df08b 100644 (file)
--- a/include/wx/wx_cw_cm.h
+++ b/include/wx/wx_cw_cm.h
@@ -6,11 +6,11 @@
 
 #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
 

-#if (__MWERKS__ < 0x0900) || macintosh
+#if (__MWERKS__ < 0x0900) || macintosh || __MACH__

     #define __MAC__
     #define __WXMAC__
 #elif (__MWERKS__ >= 0x0900) && __INTEL__
     #define __MAC__
     #define __WXMAC__
 #elif (__MWERKS__ >= 0x0900) && __INTEL__


@@ -42,20 +42,29 @@
 #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
 #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

-    #ifdef __WXDEBUG__
+         #if defined( __WXDEBUG__ ) && !defined(__MACH__)

         // otherwise the debugger looses all symbol information
         #define OPAQUE_TOOLBOX_STRUCTS 0
         // 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
+         #else
+    #define OPAQUE_TOOLBOX_STRUCTS 1

     #endif
     #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
-               */
+    #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
 #endif
 
 #define USE_DEFINE