Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix tests for __WXMSW__ in non-GUI-only code.

Browse Source 
__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
This commit is contained in:
Vadim Zeitlin
2014-05-12 13:16:11 +00:00
parent 0f6a438bb1
commit f6482e5a87
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/evtloop.h
View File

@@ -16,7 +16,7 @@
// TODO: implement wxEventLoopSource for MSW (it should wrap a HANDLE and be // TODO: implement wxEventLoopSource for MSW (it should wrap a HANDLE and be
// monitored using MsgWaitForMultipleObjects()) // monitored using MsgWaitForMultipleObjects())
#if defined(__WXOSX__) || (defined(__UNIX__) && !defined(__WXMSW__)) #if defined(__WXOSX__) || (defined(__UNIX__) && !defined(__WINDOWS__))
#define wxUSE_EVENTLOOP_SOURCE 1 #define wxUSE_EVENTLOOP_SOURCE 1
#else #else
#define wxUSE_EVENTLOOP_SOURCE 0 #define wxUSE_EVENTLOOP_SOURCE 0
@@ -263,7 +263,7 @@ private:
#endif #endif
// include the header defining wxConsoleEventLoop // include the header defining wxConsoleEventLoop
#if defined(__UNIX__) && !defined(__WXMSW__) #if defined(__UNIX__) && !defined(__WINDOWS__)
#include "wx/unix/evtloop.h" #include "wx/unix/evtloop.h"
#elif defined(__WINDOWS__) #elif defined(__WINDOWS__)
#include "wx/msw/evtloopconsole.h" #include "wx/msw/evtloopconsole.h"