Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 9df1cd02a2a8861c2e404067998323ed2a7537ec..53b04e522d69fb04e686279118fca6be7ae63c3a 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -4,7 +4,6 @@
 * Author:      Vadim Zeitlin
 * Modified by:
 * Created:     29.10.01 (extracted from wx/defs.h)
-* RCS-ID:      $Id$
 * Copyright:   (c) 1997-2001 Vadim Zeitlin
 * Licence:     wxWindows licence
 */
@@ -43,14 +42,20 @@
 #endif
 
 /*
-   first define Windows symbols if they're not defined on the command line: we
-   can autodetect everything we need if _WIN32 is defined
+    We use __WINDOWS__ as our main identification symbol for Microsoft Windows
+    but it's actually not predefined directly by any commonly used compilers
+    (only Watcom defines it itself and it's not supported any longer), so we
+    define it ourselves if any of the following macros is defined:
+
+    - MSVC _WIN32 (notice that this is also defined under Win64)
+    - Borland __WIN32__
+    - Our __WXMSW__ which selects Windows as platform automatically
  */
-#if defined(__CYGWIN__) && defined(__WINDOWS__)
-#    ifndef __WXMSW__
-#        define __WXMSW__
-#    endif
-#endif
+#if defined(_WIN32) || defined(__WIN32__) || defined(__WXMSW__)
+#    ifndef __WINDOWS__
+#        define __WINDOWS__
+#    endif /* !__WINDOWS__ */
+#endif /* Any standard symbol indicating Windows */
 
 #if defined(_WIN64)
 #    ifndef _WIN32
@@ -67,18 +72,20 @@
 #   endif /* !__WIN64__ */
 #endif /* _WIN64 */
 
-#if (defined(_WIN32) || defined(WIN32) || defined(__NT__) || defined(__WXWINCE__)) \
-    && !defined(__WXMOTIF__) && !defined(__WXGTK__) && !defined(__WXX11__)
-#    ifndef __WXMSW__
-#        define __WXMSW__
-#    endif
-#endif /* Win32 */
+#if defined(__WINDOWS__)
+    /* Select wxMSW under Windows if no other port is specified. */
+#   if !defined(__WXMSW__) && !defined(__WXMOTIF__) && !defined(__WXGTK__) && !defined(__WXX11__)
+#       define __WXMSW__
+#   endif
 
-#if defined(_WIN32)
 #   if !defined(__WINDOWS__)
 #       define __WINDOWS__
 #   endif
 
+#   ifndef _WIN32
+#        define _WIN32
+#   endif
+
 #   ifndef WIN32
 #        define WIN32
 #   endif
@@ -86,7 +93,7 @@
 #   ifndef __WIN32__
 #        define __WIN32__
 #   endif
-#endif /* _WIN32 */
+#endif /* __WINDOWS__ */
 
 /* Don't use widget toolkit specific code in non-GUI code */
 #if defined(wxUSE_GUI) && !wxUSE_GUI
@@ -395,12 +402,9 @@
 #    define wxSIZE_T_IS_UINT
 
 /*
-   OS: Otherwise it must be Windows
+   OS: Windows
  */
-#else   /* Windows */
-#    ifndef __WINDOWS__
-#        define __WINDOWS__
-#    endif  /* Windows */
+#elif defined(__WINDOWS__)
 
     /* to be changed for Win64! */
 #    ifndef __WIN32__
@@ -412,6 +416,8 @@
 #    if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG) && !defined(__WIN64__)
 #        define wxSIZE_T_IS_UINT
 #    endif
+#else
+#   error "Unknown platform."
 #endif  /* OS */
 
 /*