added fix for MSL under Win32 (by Steve Hartwell)

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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 586e48378120d46be3b6b5391592bcf9d73d372f..7d172e745ac0f36f0ca9ad7e0390481fb74c4dd0 100644 (file)
--- 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,18 +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, while some of theme
-   are not updated with <iostream> yet, so override the users setting here 
+   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__)
+#elif defined(__DMC__) || defined(__WATCOMC__)
 #    undef wxUSE_IOSTREAMH
-#    define wxUSE_IOSTREAMH 1 
+#    define wxUSE_IOSTREAMH 1
 #endif /* compilers not supporting iostream.h */
 
 /*
@@ -285,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
 
     /*
@@ -334,6 +360,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: