Source cleaning: whitespaces, -1/wxDefaultCoord, TRUE/true, FALSE/false.

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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index be0205c91bb0146a8d959cfb971dbe388e02cc1b..c7ec88649666d691d8a908f5be3ff01d9d8e16da 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -84,7 +84,8 @@
 #   endif /* !__WIN64__ */
 #endif /* _WIN64 */
 
-#if defined(_WIN32) || defined(WIN32) || defined(__NT__) || defined(__WXWINCE__)
+#if (defined(_WIN32) || defined(WIN32) || defined(__NT__) || defined(__WXWINCE__)) \
+    && !defined(__WXMOTIF__) && !defined(__WXGTK__) && !defined(__WXX11__)
 #    ifndef __WXMSW__
 #        define __WXMSW__
 #    endif
@@ -203,7 +204,10 @@
 #elif defined(__DMC__) || defined(__WATCOMC__)
 #    undef wxUSE_IOSTREAMH
 #    define wxUSE_IOSTREAMH 1
-#endif /* compilers not supporting iostream.h */
+#elif defined(__MINGW32__)
+#    undef wxUSE_IOSTREAMH
+#    define wxUSE_IOSTREAMH 0
+#endif /* compilers with/without iostream.h */
 
 /*
    old C++ headers (like <iostream.h>) declare classes in the global namespace
@@ -422,7 +426,7 @@
 #if ( defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \
     defined( __CYGWIN__ ) || \
       (defined(__WATCOMC__) && __WATCOMC__ >= 1200) ) && \
-    !defined(__DOS__)
+    !defined(__DOS__) && !defined(__WXMOTIF__) && !defined(__WXGTK__) && !defined(__WXX11__)
 #    include "wx/msw/gccpriv.h"
 #else
 #    undef wxCHECK_W32API_VERSION