X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/17a1ebd101f0653e69736416a2a28d0ada423141..619996567a61c7b9df0694063f7ac2200166ae1b:/src/x11/evtloop.cpp diff --git a/src/x11/evtloop.cpp b/src/x11/evtloop.cpp index 5167c4b918..408d6fee34 100644 --- a/src/x11/evtloop.cpp +++ b/src/x11/evtloop.cpp @@ -339,8 +339,6 @@ bool wxEventLoopImpl::SendIdleEvent() // wxEventLoop implementation // ============================================================================ -wxEventLoop *wxEventLoopBase::ms_activeLoop = NULL; - // ---------------------------------------------------------------------------- // wxEventLoop running and exiting // ---------------------------------------------------------------------------- @@ -357,8 +355,7 @@ int wxEventLoop::Run() m_impl = new wxEventLoopImpl; - wxEventLoop *oldLoop = ms_activeLoop; - ms_activeLoop = this; + wxEventLoopActivator activate(this); m_impl->m_keepGoing = TRUE; while ( m_impl->m_keepGoing ) @@ -400,8 +397,6 @@ int wxEventLoop::Run() delete m_impl; m_impl = NULL; - ms_activeLoop = oldLoop; - return exitcode; }