wxEncodingConverter should and can be compiled

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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 06886d705ab37ae2a631c465ef9e68d19331473a..bd30bf68f22f2e8f2e05e67c24c7d083c7d9ba51 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -30,23 +30,26 @@
     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
 
 /*
@@ -69,6 +72,27 @@
 #    endif
 #endif
 
+#if defined(__PALMOS__)
+#   ifndef __WXPALMOS__
+#       define __WXPALMOS__
+#   endif
+#   ifdef __WXMSW__
+#       undef __WXMSW__
+#   endif
+#   ifdef __WINDOWS__
+#       undef __WINDOWS__
+#   endif
+#   ifdef __WIN32__
+#       undef __WIN32__
+#   endif
+#   ifdef WIN32
+#       undef WIN32
+#   endif
+#   ifdef _WIN32
+#       undef _WIN32
+#   endif
+#endif
+
 #if defined(_WIN64)
 #    ifndef _WIN32
         /*
@@ -389,6 +413,17 @@
 #    endif
 #    define wxSIZE_T_IS_UINT
 
+#elif defined(__PALMOS__)
+#    ifdef __WIN32__
+#        error "__WIN32__ should not be defined for PalmOS"
+#    endif
+#    ifdef __WINDOWS__
+#        error "__WINDOWS__ should not be defined for PalmOS"
+#    endif
+#    ifdef __WXMSW__
+#        error "__WXMSW__ should not be defined for PalmOS"
+#    endif
+
 #else   /* Windows */
 #    ifndef __WINDOWS__
 #        define __WINDOWS__
@@ -462,7 +497,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(__WXPALMOS__)
+#    include "wx/palmos/gccpriv.h"
+#elif ( defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \
     defined( __CYGWIN__ ) || \
       (defined(__WATCOMC__) && __WATCOMC__ >= 1200) ) && \
     !defined(__DOS__) && !defined(__WXMOTIF__) && !defined(__WXGTK__) && !defined(__WXX11__)
@@ -519,7 +556,7 @@
 #endif
 
 /*
-    We need AvailabilityMacros.h for ifdefing out things that don't exist on 
+    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
 */