From f6482e5a8792a4159a33cdf2086fe2638bc10aff Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 12 May 2014 13:16:11 +0000 Subject: [PATCH] Fix tests for __WXMSW__ in non-GUI-only code. __WXMSW__ is not defined when compiling wxBase, so the tests which were meant to prevent using Unix event loop classes under Cygwin (under which both __UNIX__ and __WINDOWS__, but not __WXMSW__, are defined) failed, breaking compilation of all wxEventLoop-related code in wxBase in Cygwin builds. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76516 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/evtloop.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wx/evtloop.h b/include/wx/evtloop.h index 6eaa479b8d..1133473a02 100644 --- a/include/wx/evtloop.h +++ b/include/wx/evtloop.h @@ -16,7 +16,7 @@ // TODO: implement wxEventLoopSource for MSW (it should wrap a HANDLE and be // monitored using MsgWaitForMultipleObjects()) -#if defined(__WXOSX__) || (defined(__UNIX__) && !defined(__WXMSW__)) +#if defined(__WXOSX__) || (defined(__UNIX__) && !defined(__WINDOWS__)) #define wxUSE_EVENTLOOP_SOURCE 1 #else #define wxUSE_EVENTLOOP_SOURCE 0 @@ -263,7 +263,7 @@ private: #endif // include the header defining wxConsoleEventLoop -#if defined(__UNIX__) && !defined(__WXMSW__) +#if defined(__UNIX__) && !defined(__WINDOWS__) #include "wx/unix/evtloop.h" #elif defined(__WINDOWS__) #include "wx/msw/evtloopconsole.h"