X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/31bb37a246396b7384818e3d0dfd3f89545e47a1..a1ae1090eebbc49d8495c3d3464457277af846db:/include/wx/platform.h

diff --git a/include/wx/platform.h b/include/wx/platform.h
index d1c131e03e..d9670ec48e 100644
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -23,6 +23,32 @@
 #    include <stddef.h>
 #endif
 
+/*
+	WXMAC variants
+	__WXMAC_CLASSIC__ means ppc non-carbon builds, __WXMAC_CARBON__ means
+	carbon API available (mach or cfm builds) , __WXMAC_OSX__ means mach-o
+	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
+#endif
+
 /*
    first define Windows symbols if they're not defined on the command line: we
    can autodetect everything we need if _WIN32 is defined
@@ -94,6 +120,13 @@
 #    endif
 #endif /* WINE */
 
+/* detect SmartPhone */
+#if defined( WIN32_PLATFORM_WFSP )
+#    ifndef __SMARTPHONE__
+#        define __SMARTPHONE__
+#    endif
+#endif
+
 /*
    Include wx/setup.h for the Unix platform defines generated by configure and
    the library compilation options
@@ -129,7 +162,10 @@
 #   endif
 #endif /* wxUSE_UNICODE */
 
-
+#if defined( __MWERKS__ ) && !defined(__INTEL__)
+// otherwise MSL headers bring in WIN32 dependant APIs
+#undef UNICODE
+#endif
 /*
    some compilers don't support iostream.h any longer, while some of theme
    are not updated with <iostream> yet, so override the users setting here
@@ -138,7 +174,7 @@
 #if defined(_MSC_VER) && (_MSC_VER >= 1310)
 #    undef wxUSE_IOSTREAMH
 #    define wxUSE_IOSTREAMH 0
-#elif defined(__DMC__)
+#elif defined(__DMC__) || defined(__WATCOMC__)
 #    undef wxUSE_IOSTREAMH
 #    define wxUSE_IOSTREAMH 1
 #endif /* compilers not supporting iostream.h */
@@ -285,7 +321,7 @@
 
     /* to be changed for Win64! */
 #    ifndef __WIN32__
-#        define __WIN16__
+#        error "__WIN32__ should be defined for Win32 and Win64, Win16 is not supported"
 #    endif
 
     /*
@@ -334,6 +370,11 @@
 #    endif
 #endif
 
+/* Force linking against required libraries under Windows CE: */
+#ifdef __WXWINCE__
+#   include "wx/msw/wince/libraries.h"
+#endif
+
 /*
    This macro can be used to test the gcc version and can be used like this: