From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 25 Jul 2004 11:34:37 +0000 (+0000)
Subject: wxGTK/Cygwin fix (patch 914565)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/d5cd19b45cb8ed187238a64fd6a672a2d8c98b4d

wxGTK/Cygwin fix (patch 914565)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/platform.h b/include/wx/platform.h
index be0205c91b..6518f7396d 100644
--- 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
@@ -422,7 +423,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