Fix wxQT monolithic build on Linux

- Remove duplicate wxConsoleAppTraits::CreateEventLoop()
  It's already defined for Unix as well as Windows

- Remove wxEventLoop AddSourceForFD() "override"
  the base version is static and therefore clearly not meant to be overridden
This commit is contained in:
Paul Cornett
2019-02-25 00:35:27 -08:00
parent 0659006dc6
commit 5e3c39043d
3 changed files with 0 additions and 28 deletions

View File

@@ -27,10 +27,6 @@ public:
void ScheduleIdleCheck();
#if wxUSE_EVENTLOOP_SOURCE
virtual wxEventLoopSource *AddSourceForFD(int fd, wxEventLoopSourceHandler *handler, int flags);
#endif // wxUSE_EVENTLOOP_SOURCE
private:
QEventLoop *m_qtEventLoop;
wxObjectDataPtr<wxQtIdleTimer> m_qtIdleTimer;

View File

@@ -53,17 +53,3 @@ wxPortId wxGUIAppTraits::GetToolkitVersion(int *majVer,
return wxPORT_QT;
}
//#############################################################################
// this one fails to link under Windows; why is src/msw/basemsw.cpp picked up???
#if wxUSE_CONSOLE_EVENTLOOP && !defined(__WINDOWS__)
wxEventLoopBase *wxConsoleAppTraits::CreateEventLoop()
{
return new wxEventLoop();
}
#endif
//#############################################################################

View File

@@ -264,16 +264,6 @@ wxEventLoopSourcesManagerBase* wxAppTraits::GetEventLoopSourcesManager()
#endif
wxEventLoopSource *wxQtEventLoopBase::AddSourceForFD(int fd, wxEventLoopSourceHandler *handler, int flags)
{
wxGUIAppTraits *AppTraits = dynamic_cast<wxGUIAppTraits *>(wxApp::GetTraitsIfExists());
if ( AppTraits )
return AppTraits->GetEventLoopSourcesManager()->AddSourceForFD(fd, handler, flags);
return NULL;
}
#endif // wxUSE_EVENTLOOP_SOURCE
//#############################################################################