X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8000ae7f7c73885a6c1d1c29cee11ec86a96f2d1..1978421a6d8b81c1f8a961da4b8ddf544fec7b1b:/src/gtk/evtloop.cpp diff --git a/src/gtk/evtloop.cpp b/src/gtk/evtloop.cpp index 268cfba85b..9ff74e58c3 100644 --- a/src/gtk/evtloop.cpp +++ b/src/gtk/evtloop.cpp @@ -6,7 +6,7 @@ // Created: 10.07.01 // RCS-ID: $Id$ // Copyright: (c) 2001 Vadim Zeitlin -// License: wxWindows license +// License: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "evtloop.h" #endif @@ -62,6 +62,8 @@ private: // wxEventLoop running and exiting // ---------------------------------------------------------------------------- +wxEventLoop *wxEventLoop::ms_activeLoop = NULL; + wxEventLoop::~wxEventLoop() { wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") ); @@ -77,6 +79,9 @@ int wxEventLoop::Run() // event loops are not recursive, you need to create another loop! wxCHECK_MSG( !IsRunning(), -1, _T("can't reenter a message loop") ); + wxEventLoop *oldLoop = ms_activeLoop; + ms_activeLoop = this; + m_impl = new wxEventLoopImpl; gtk_main(); @@ -85,6 +90,8 @@ int wxEventLoop::Run() delete m_impl; m_impl = NULL; + ms_activeLoop = oldLoop; + return exitcode; }