X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/79e7089470c3523bd4a728156f4910e9e2e8ce9c..3df732cd473eb29e12ce374afe074c404a86f55e:/include/wx/platform.h

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 59b66e8ff7..6c2ceecbb5 100644
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -19,7 +19,7 @@
     Codewarrior doesn't define any Windows symbols until some headers
     are included
 */
-#if __MWERKS__
+#ifdef __MWERKS__
 #    include <stddef.h>
 #endif
 
@@ -57,9 +57,7 @@
    first define Windows symbols if they're not defined on the command line: we
    can autodetect everything we need if _WIN32 is defined
  */
-#if defined(__CYGWIN32__) && !defined(__WXMOTIF__) && !defined(__WXGTK__) \
-    && !defined(__WXX11__)
-    /* for Cygwin, default to wxMSW unless otherwise specified */
+#if defined(__CYGWIN__) && defined(__WINDOWS__)
 #    ifndef __WXMSW__
 #        define __WXMSW__
 #    endif
@@ -119,50 +117,8 @@
 #        define __WIN32__
 #    endif
 
-    /*
-        The library user may override the default setting of WINVER by defining
-        it in his own makefile or project file -- if it is defined, we don't
-        touch it at all.
-
-        It makes sense to define WINVER as:
-            - either some lowish value (e.g. 0x0302) to not even compile in the
-              features not available in Windows version lower than some given
-              one
-            - or to a higher value than the one used by default for the given
-              compiler if you updated its headers to newer version of Platform
-              SDK, e.g. VC6 ships with 0x0400 headers by default but may also
-              work with 0x0500 headers and beyond
-    */
-#   ifndef WINVER
-#       if defined(_MSC_VER) && _MSC_VER < 1300
-            /*
-                VC6 defines some stuff in its default headers which is normally
-                only present if WINVER >= 0x0500 (FLASHW_XXX constants) which
-                means that our usual tests not involving WINVER sometimes fail
-                with it, hence explicitly define a lower WINVER value for it.
-             */
-#           define WINVER 0x0400
-#       elif defined(__DMC__)
-            /*
-                Digital Mars is distributed with a little outdated headers.
-             */
-#           define WINVER 0x0400
-#       else /* !VC++ 6 */
-            /*
-               see MSDN for the description of possible WINVER values, this one
-               is the highest one defined right now (Windows Server 2003) and
-               we use it unless it was explicitly overridden by the user to
-               disable recent features support as we check for all of the
-               features we use which could be not available on earlier Windows
-               systems during run-time anyhow, so there is almost no
-               disadvantage in using it.
-             */
-#           define WINVER 0x0502
-#       endif /* VC++ 6/!VC++6 */
-#   endif
-
-    /* Win95 means Win95-style UI, i.e. Win9x/NT 4+ */
-#    if !defined(__WIN95__) && (WINVER >= 0x0400)
+    /* this means Win95-style UI, i.e. Win9x/NT 4+: always true now */
+#    if !defined(__WIN95__)
 #        define __WIN95__
 #    endif
 #endif /* Win32 */
@@ -516,12 +472,6 @@
 #   include "wx/msw/wince/libraries.h"
 #endif
 
-/* Force inclusion of main PalmOS header: */
-#ifdef __WXPALMOS__
-#   include <PalmOS.h>
-#   undef Abs
-#endif
-
 /*
    This macro can be used to test the gcc version and can be used like this:
 
@@ -541,9 +491,10 @@
    at least maj.min
  */
 #if ( defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \
-    defined( __CYGWIN__ ) || \
+    ( defined( __CYGWIN__ ) && defined( __WINDOWS__ ) ) || \
       (defined(__WATCOMC__) && __WATCOMC__ >= 1200) ) && \
     !defined(__DOS__) && \
+    !defined(__WXOS2__) && \
     !defined(__WXMOTIF__) && \
     !defined(__WXGTK__) && \
     !defined(__WXX11__) && \
@@ -561,7 +512,7 @@
 #endif
 
 #if defined (__WXMAC__)
-#    ifndef WORDS_BIGENDIAN && ( !defined(__MACH__) || ( defined(__BIG_ENDIAN__) && __BIG_ENDIAN__ ) )
+#    if !defined(WORDS_BIGENDIAN) && ( !defined(__MACH__) || ( defined(__BIG_ENDIAN__) && __BIG_ENDIAN__ ) )
 #        define WORDS_BIGENDIAN 1
 #    endif
 #endif
@@ -610,4 +561,3 @@
 #endif
 
 #endif /* _WX_PLATFORM_H_ */
-