reverted, the problem is deeper than that

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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index aed9b04776ed952996fa34807528bdc0484ae7d2..03ae2586795055cb41940436af69e0c4a9c9a409 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -30,23 +30,26 @@
     builds, running under 10.2 + only
 */
 #ifdef __WXMAC__
     builds, running under 10.2 + only
 */
 #ifdef __WXMAC__

-    #if defined(__MACH__)
-        #define __WXMAC_OSX__ 1
-        #define __WXMAC_CARBON__ 1
-        #define __WXMAC_CLASSIC__ 0
-        #ifdef __WXMAC_XCODE__
-            #include "wx/mac/carbon/config_xcode.h"
-        #endif
-    #else
-        #define __WXMAC_OSX__ 0
-        #if TARGET_CARBON
-            #define __WXMAC_CARBON__ 1
-            #define __WXMAC_CLASSIC__ 0
-        #else
-            #define __WXMAC_CARBON__ 0
-            #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
 
 /*
 #endif
 
 /*


@@ -462,7 +465,9 @@
    This macro can be used to check that the version of mingw32 compiler is
    at least maj.min
  */
    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__)
     defined( __CYGWIN__ ) || \
       (defined(__WATCOMC__) && __WATCOMC__ >= 1200) ) && \
     !defined(__DOS__) && !defined(__WXMOTIF__) && !defined(__WXGTK__) && !defined(__WXX11__)


@@ -518,5 +523,14 @@
 #    define wxUSE_WXDIB 1
 #endif
 
 #    define wxUSE_WXDIB 1
 #endif
 

+/*
+    We need AvailabilityMacros.h for ifdefing out things that don't exist on 
+    OSX 10.2 and lower
+    FIXME:  We need a better way to detect for 10.3 then including a system header
+*/
+#ifdef __DARWIN__
+    #include <AvailabilityMacros.h>
+#endif
+

 #endif /* _WX_PLATFORM_H_ */
 
 #endif /* _WX_PLATFORM_H_ */