X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ff8fbb8dbe30fa6b47ad0ed9c581123bfaac3d9d..0cc970b3db1c7390bec36e612b1fcc657bd06a8c:/include/wx/platform.h?ds=inline

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 6bb277a2bf..2e0320a144 100644
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -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
@@ -474,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:
 
@@ -499,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__) && \
@@ -568,4 +561,3 @@
 #endif
 
 #endif /* _WX_PLATFORM_H_ */
-