From 88734cb6d7a23b758c79360816c4ee61f65fce6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C4=83t=C4=83lin=20R=C4=83ceanu?= Date: Fri, 3 Aug 2018 00:53:54 +0300 Subject: [PATCH] wxQT Windows build fix, rather incorrect --- src/msw/basemsw.cpp | 1 + src/qt/apptraits.cpp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/msw/basemsw.cpp b/src/msw/basemsw.cpp index 3204e02154..5cf06c48b6 100644 --- a/src/msw/basemsw.cpp +++ b/src/msw/basemsw.cpp @@ -86,6 +86,7 @@ wxTimerImpl *wxConsoleAppTraits::CreateTimerImpl(wxTimer *timer) #endif // wxUSE_TIMER +// Why can't this be disabled for __WXQT__ ??? There is an implementation in src/qt/apptraits.cpp wxEventLoopBase *wxConsoleAppTraits::CreateEventLoop() { #if wxUSE_CONSOLE_EVENTLOOP diff --git a/src/qt/apptraits.cpp b/src/qt/apptraits.cpp index 1f1553f6c0..3f44fd8f8e 100644 --- a/src/qt/apptraits.cpp +++ b/src/qt/apptraits.cpp @@ -56,7 +56,8 @@ wxPortId wxGUIAppTraits::GetToolkitVersion(int *majVer, //############################################################################# -#if wxUSE_CONSOLE_EVENTLOOP +// this one fails to link under Windows; why is src/msw/basemsw.cpp picked up??? +#if wxUSE_CONSOLE_EVENTLOOP && !defined(__WINDOWS__) wxEventLoopBase *wxConsoleAppTraits::CreateEventLoop() {