don't define wxEventLoop class differently in GUI and base, this breaks the
ODR and hence results in many problems in practice; instead use wxEventLoopBase whenever possible and #define wxEventLoop differently in console applications git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46158 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -213,7 +213,7 @@ bool wxGUIAppTraits::DoMessageFromThreadWait()
|
||||
{
|
||||
// we should return false only if the app should exit, i.e. only if
|
||||
// Dispatch() determines that the main event loop should terminate
|
||||
wxEventLoop *evtLoop = wxEventLoop::GetActive();
|
||||
wxEventLoopBase * const evtLoop = wxEventLoop::GetActive();
|
||||
if ( !evtLoop || !evtLoop->Pending() )
|
||||
{
|
||||
// no events means no quit event
|
||||
@@ -271,7 +271,7 @@ wxTimerImpl *wxGUIAppTraits::CreateTimerImpl(wxTimer *timer)
|
||||
return new wxMSWTimerImpl(timer);
|
||||
}
|
||||
|
||||
wxEventLoop* wxGUIAppTraits::CreateEventLoop()
|
||||
wxEventLoopBase* wxGUIAppTraits::CreateEventLoop()
|
||||
{
|
||||
return new wxEventLoop;
|
||||
}
|
||||
|
Reference in New Issue
Block a user