Fix for Bug #229543

[wxWidgets.git] / include / wx / defs.h

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 34972041b410744c54745a301625b19ad6498257..352820024a928202057088f1af673df4e6b63587 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -52,8 +52,33 @@
         #define OS2EMX_PLAIN_CHAR
     #endif
 
-#elif defined(applec) || defined(THINK_C) || ( defined( __MWERKS__ ) && !defined(__INTEL__) )
+    #if defined(__APPLE__)
+       // MacOS X
+        #ifndef __WXMAC__
+            #define __WXMAC__
+        #endif
+        #ifndef __WXMAC_X__
+            #define __WXMAC_X__
+        #endif
+    
+        #define PM_USE_SESSION_APIS 0
+        #include <Carbon/Carbon.h>
+    #endif
+#elif defined(applec) || defined(THINK_C) || (defined(__MWERKS__) && !defined(__INTEL__))
         // MacOS
+#elif defined(__WXMAC__) && defined(__APPLE__)
+       // MacOS X
+    #define __UNIX_LIKE__
+
+    #ifndef __WXMAC__
+        #define __WXMAC__
+    #endif
+    #ifndef __WXMAC_X__
+        #define __WXMAC_X__
+    #endif
+    
+    #define PM_USE_SESSION_APIS 0
+    #include <Carbon/Carbon.h>
 #elif defined(__OS2__)
     #if defined(__IBMCPP__)
         #define __VISAGEAVER__ __IBMCPP__