X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12c194883023e9369b9a507fb22fa23c89288b11..271cad4cf73376f27c2071b53e534e7ad51ece82:/include/wx/platform.h

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 63472e8655..6085934aa8 100644
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -23,6 +23,29 @@
 #    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
+	#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
@@ -129,14 +152,21 @@
 #   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, so override the users
-   setting here in such case.
+   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
+   in such case.
  */
 #if defined(_MSC_VER) && (_MSC_VER >= 1310)
 #    undef wxUSE_IOSTREAMH
 #    define wxUSE_IOSTREAMH 0
+#elif defined(__DMC__)
+#    undef wxUSE_IOSTREAMH
+#    define wxUSE_IOSTREAMH 1
 #endif /* compilers not supporting iostream.h */
 
 /*
@@ -281,7 +311,7 @@
 
     /* to be changed for Win64! */
 #    ifndef __WIN32__
-#        define __WIN16__
+#        error "__WIN32__ should be defined for Win32 and Win64, Win16 is not supported"
 #    endif
 
     /*
@@ -348,9 +378,10 @@
    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( __GNUWIN32__ ) || defined( __MINGW32__ ) || \
     defined( __CYGWIN__ ) || \
-    (defined(__WATCOMC__) && __WATCOMC__ >= 1200)
+      (defined(__WATCOMC__) && __WATCOMC__ >= 1200) ) && \
+    !defined(__DOS__)
 #    include "wx/msw/gccpriv.h"
 #else
 #    undef wxCHECK_W32API_VERSION