X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b3c35859d85c0771516a378bcd8cb9f45d3837d0..c2e5616e067362c41c8103338323e0dab3a53f1e:/include/wx/platform.h

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 91f11101ec..df1f9cdcc1 100644
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -117,6 +117,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
@@ -164,7 +171,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 */
@@ -311,7 +318,7 @@
 
     /* to be changed for Win64! */
 #    ifndef __WIN32__
-#        define __WIN16__
+#        error "__WIN32__ should be defined for Win32 and Win64, Win16 is not supported"
 #    endif
 
     /*
@@ -360,6 +367,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: