X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ca80fdee5eea286d700e0a8f03c88da9f4f88ade..ff4aedc55481dfb2bf3ddfc9a604189809af79d6:/include/wx/platform.h

diff --git a/include/wx/platform.h b/include/wx/platform.h
index e9bf1eba6f..03ae258679 100644
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -30,19 +30,26 @@
     builds, running under 10.2 + only
 */
 #ifdef __WXMAC__
-    #if defined(__MACH__)
-        #define __WXMAC_OSX__ 1
-        #define __WXMAC_CARBON__ 1
-        #ifdef __WXMAC_XCODE__
-            #include "wx/mac/carbon/config_xcode.h"
-        #endif
-    #else
-        #if TARGET_CARBON
-            #define __WXMAC_CARBON__ 1
-        #else
-            #define __WXMAC_CLASSIC__ 1
-        #endif
-    #endif
+#    if defined(__MACH__)
+#        define __WXMAC_OSX__
+#        define __WXMAC_CARBON__
+#        ifdef __WXMAC_XCODE__
+#            include "wx/mac/carbon/config_xcode.h"
+#        endif
+#    else
+#        if TARGET_CARBON
+#            define __WXMAC_CARBON__
+#        else
+#            define __WXMAC_CLASSIC__
+#        endif
+#    endif
+#endif
+
+/*
+    __WXOSX__ is a common define to wxMac (Carbon) and wxCocoa ports under OS X.
+ */
+#if defined(__WXMAC_OSX__) || defined(__WXCOCOA__)
+#   define __WXOSX__
 #endif
 
 /*
@@ -458,7 +465,9 @@
    This macro can be used to check that the version of mingw32 compiler is
    at least maj.min
  */
-#if ( defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \
+#if defined(__PALMOS__)
+#    include "wx/palmos/gccpriv.h"
+#elif ( defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \
     defined( __CYGWIN__ ) || \
       (defined(__WATCOMC__) && __WATCOMC__ >= 1200) ) && \
     !defined(__DOS__) && !defined(__WXMOTIF__) && !defined(__WXGTK__) && !defined(__WXX11__)