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

wxQT Windows build fix, rather incorrect

Browse Source
This commit is contained in:
Cătălin Răceanu
2018-08-03 00:53:54 +03:00
parent 5adc65d085
commit 88734cb6d7
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/msw/basemsw.cpp
View File

@@ -86,6 +86,7 @@ wxTimerImpl *wxConsoleAppTraits::CreateTimerImpl(wxTimer *timer)
#endif // wxUSE_TIMER #endif // wxUSE_TIMER
// Why can't this be disabled for __WXQT__ ??? There is an implementation in src/qt/apptraits.cpp
wxEventLoopBase *wxConsoleAppTraits::CreateEventLoop() wxEventLoopBase *wxConsoleAppTraits::CreateEventLoop()
{ {
#if wxUSE_CONSOLE_EVENTLOOP #if wxUSE_CONSOLE_EVENTLOOP

3
src/qt/apptraits.cpp
View File

@@ -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() wxEventLoopBase *wxConsoleAppTraits::CreateEventLoop()
{ {