gtk notebook page style fixes (patch 984864)

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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index d9670ec48e6745f2e344dfdcd5ea7897ecba5acb..c7ec88649666d691d8a908f5be3ff01d9d8e16da 100644 (file)
--- 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
 */
 
@@ -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
@@ -127,6 +128,32 @@
 #    endif
 #endif
 
+/* detect PocketPC */
+#if defined( WIN32_PLATFORM_PSPC )
+#    ifndef __POCKETPC__
+#        define __POCKETPC__
+#    endif
+#endif
+
+/* detect Standard WinCE SDK */
+#if defined( WCE_PLATFORM_STANDARDSDK )
+#    ifndef __WINCE_STANDARDSDK__
+#        define __WINCE_STANDARDSDK__
+#    endif
+#endif
+
+#if defined(_WIN32_WCE) && !defined(WIN32_PLATFORM_WFSP) && !defined(WIN32_PLATFORM_PSPC)
+#   if (_WIN32_WCE >= 400)
+#       ifndef __WINCE_NET__
+#           define __WINCE_NET__
+#       endif
+#   elif (_WIN32_WCE >= 200) 
+#       ifndef __HANDHELDPC__
+#           define __HANDHELDPC__
+#       endif
+#   endif
+#endif
+
 /*
    Include wx/setup.h for the Unix platform defines generated by configure and
    the library compilation options
@@ -138,7 +165,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
  */
 
@@ -177,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
@@ -396,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