Applied patch [ 1331340 ] faster Drawing of Polygons and Polylines

[wxWidgets.git] / src / gtk / evtloop.cpp

diff --git a/src/gtk/evtloop.cpp b/src/gtk/evtloop.cpp
index 361fa3ab92738735593d27e6d0a621cd70cd5c8c..d684ccb0eb167877e416b8f85a6350b41a30b8be 100644 (file)
--- 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 <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     10.07.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// License:     wxWindows license
+// License:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "evtloop.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -28,10 +24,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#ifndef WX_PRECOMP
-#endif //WX_PRECOMP
-

 #include "wx/evtloop.h"
 #include "wx/evtloop.h"

+#include "wx/app.h"

 
 #include <gtk/gtk.h>
 
 
 #include <gtk/gtk.h>
 


@@ -62,25 +56,17 @@ private:
 // wxEventLoop running and exiting
 // ----------------------------------------------------------------------------
 
 // wxEventLoop running and exiting
 // ----------------------------------------------------------------------------
 

-wxEventLoop *wxEventLoop::ms_activeLoop = NULL;
-

 wxEventLoop::~wxEventLoop()
 {
     wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") );
 }
 
 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") );
 
 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;
+    wxEventLoopActivator activate(this);

 
     m_impl = new wxEventLoopImpl;
 
 
     m_impl = new wxEventLoopImpl;
 


@@ -90,8 +76,6 @@ int wxEventLoop::Run()
     delete m_impl;
     m_impl = NULL;
 
     delete m_impl;
     m_impl = NULL;
 

-    ms_activeLoop = oldLoop;
-

     return exitcode;
 }
 
     return exitcode;
 }
 


@@ -110,7 +94,14 @@ void wxEventLoop::Exit(int rc)
 
 bool wxEventLoop::Pending() const
 {
 
 bool wxEventLoop::Pending() const
 {

-    return gtk_events_pending() > 0;
+    if (wxTheApp)
+    {
+        // We need to remove idle callbacks or gtk_events_pending will
+        // never return false.
+        wxTheApp->RemoveIdleTag();
+    }
+
+    return gtk_events_pending();

 }
 
 bool wxEventLoop::Dispatch()
 }
 
 bool wxEventLoop::Dispatch()