X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8000ae7f7c73885a6c1d1c29cee11ec86a96f2d1..024f89f972a6787e82d77fc5e5dac302a56abbb0:/src/gtk1/evtloop.cpp?ds=sidebyside diff --git a/src/gtk1/evtloop.cpp b/src/gtk1/evtloop.cpp index 268cfba85b..74d4132b43 100644 --- a/src/gtk1/evtloop.cpp +++ b/src/gtk1/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 @@ -31,6 +31,7 @@ #ifndef WX_PRECOMP #endif //WX_PRECOMP +#include "wx/app.h" #include "wx/evtloop.h" #include @@ -62,21 +63,21 @@ private: // wxEventLoop running and exiting // ---------------------------------------------------------------------------- +wxEventLoop *wxEventLoopBase::ms_activeLoop = NULL; + wxEventLoop::~wxEventLoop() { wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") ); } -bool wxEventLoop::IsRunning() const -{ - return m_impl != NULL; -} - 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 +86,8 @@ int wxEventLoop::Run() delete m_impl; m_impl = NULL; + ms_activeLoop = oldLoop; + return exitcode; } @@ -101,9 +104,20 @@ void wxEventLoop::Exit(int rc) // wxEventLoop message processing dispatching // ---------------------------------------------------------------------------- +extern bool g_isIdle; + bool wxEventLoop::Pending() const { - return gtk_events_pending() > 0; + if (wxTheApp && !g_isIdle) + { + // We need to remove idle callbacks or gtk_events_pending will + // never return false. + gtk_idle_remove( wxTheApp->m_idleTag ); + wxTheApp->m_idleTag = 0; + g_isIdle = TRUE; + } + + return gtk_events_pending(); } bool wxEventLoop::Dispatch()