X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cf6fa9b9ad72ef4f816a11aaee4dd456928af1f8..005198fa7d8e244f9c9c28263c8eca5a9ced8e16:/include/wx/platform.h

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 2d9c7d6a3c..d67532a204 100644
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -5,7 +5,7 @@
 * Modified by:
 * Created:     29.10.01 (extracted from wx/defs.h)
 * RCS-ID:      $Id$
-* Copyright:   (c) 1997-2001 wxWindows team
+* Copyright:   (c) 1997-2001 wxWidgets team
 * Licence:     wxWindows licence
 */
 
@@ -34,6 +34,9 @@
 		#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
@@ -117,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
@@ -128,7 +138,7 @@
 
 /*
    adjust the Unicode setting: wxUSE_UNICODE should be defined as 0 or 1
-   and is used by wxWindows, _UNICODE and/or UNICODE may be defined or used by
+   and is used by wxWidgets, _UNICODE and/or UNICODE may be defined or used by
    the system headers so bring these settings in sync
  */
 
@@ -152,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
@@ -161,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 */
@@ -308,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
 
     /*
@@ -357,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: