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

don't define wxEventLoop class differently in GUI and base, this breaks the

Browse Source 
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:
Vadim Zeitlin
2007-05-22 02:30:01 +00:00
parent 30c15c1d73
commit 2ddff00c92
24 changed files with 58 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/appbase.cpp
View File

@@ -119,7 +119,7 @@ wxAppInitializerFunction wxAppConsole::ms_appInitFn = NULL;
// ----------------------------------------------------------------------------
// this defines wxEventLoopPtr
wxDEFINE_TIED_SCOPED_PTR_TYPE(wxEventLoop)
wxDEFINE_TIED_SCOPED_PTR_TYPE(wxEventLoopBase)
// ============================================================================
// wxAppConsole implementation
@@ -185,7 +185,7 @@ bool wxAppConsole::Initialize(int& argcOrig, wxChar **argvOrig)
return true;
}
wxEventLoop *wxAppConsole::CreateMainLoop()
wxEventLoopBase *wxAppConsole::CreateMainLoop()
{
return GetTraits()->CreateEventLoop();
}
@@ -290,7 +290,7 @@ wxAppTraits *wxAppConsole::GetTraits()
int wxAppConsole::MainLoop()
{
wxEventLoopTiedPtr mainLoop(&m_mainLoop, CreateMainLoop());
wxEventLoopBaseTiedPtr mainLoop(&m_mainLoop, CreateMainLoop());
return m_mainLoop ? m_mainLoop->Run() : -1;
}
@@ -310,7 +310,7 @@ bool wxAppConsole::Pending()
// use the currently active message loop here, not m_mainLoop, because if
// we're showing a modal dialog (with its own event loop) currently the
// main event loop is not running anyhow
wxEventLoop * const loop = wxEventLoopBase::GetActive();
wxEventLoopBase * const loop = wxEventLoopBase::GetActive();
return loop && loop->Pending();
}
@@ -318,7 +318,7 @@ bool wxAppConsole::Pending()
bool wxAppConsole::Dispatch()
{
// see comment in Pending()
wxEventLoop * const loop = wxEventLoopBase::GetActive();
wxEventLoopBase * const loop = wxEventLoopBase::GetActive();
return loop && loop->Dispatch();
}