Dispatch pending events without waiting for idle time (closes #10994).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61470 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/evtloop.h b/include/wx/evtloop.h
index ad58b1482c1e354a6e1353f0a51bf78050a77aca..7bef1f38dd7aa05afe16dfba49b2cb8d2f2318d6 100644 (file)
--- a/include/wx/evtloop.h
+++ b/include/wx/evtloop.h
@@ -197,6 +197,12 @@ protected:
     bool m_shouldExit;
 
 private:
     bool m_shouldExit;
 
 private:

+    // process all already pending events and dispatch a new one (blocking
+    // until it appears in the event queue if necessary)
+    //
+    // returns the return value of Dispatch()
+    bool ProcessEvents();
+

     wxDECLARE_NO_COPY_CLASS(wxEventLoopManual);
 };
 
     wxDECLARE_NO_COPY_CLASS(wxEventLoopManual);
 };
 

diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index 936d8d21b52d22dac845d99328eea1311a509e98..888c6828f70f499d5bb179f5fd41a1a66581e850 100644 (file)
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -333,9 +333,6 @@ void wxAppConsoleBase::WakeUpIdle()
 
 bool wxAppConsoleBase::ProcessIdle()
 {
 
 bool wxAppConsoleBase::ProcessIdle()
 {

-    // process pending wx events before sending idle events
-    ProcessPendingEvents();
-

     // synthesize an idle event and check if more of them are needed
     wxIdleEvent event;
     event.SetEventObject(this);
     // synthesize an idle event and check if more of them are needed
     wxIdleEvent event;
     event.SetEventObject(this);

diff --git a/src/common/evtloopcmn.cpp b/src/common/evtloopcmn.cpp
index f4adbbed10bcd5218273b592f51770b0a72ddde6..a7ce28dc6c71e1c1ca25a1e4eeb4cc1bd10c5415 100644 (file)
--- a/src/common/evtloopcmn.cpp
+++ b/src/common/evtloopcmn.cpp
@@ -94,18 +94,33 @@ wxEventLoopManual::wxEventLoopManual()
     m_shouldExit = false;
 }
 
     m_shouldExit = false;
 }
 

+bool wxEventLoopManual::ProcessEvents()
+{
+    // process pending wx events first as they correspond to low-level events
+    // which happened before, i.e. typically pending events were queued by a
+    // previous call to Dispatch() and if we didn't process them now the next
+    // call to it might enqueue them again (as happens with e.g. socket events
+    // which would be generated as long as there is input available on socket
+    // and this input is only removed from it when pending event handlers are
+    // executed)
+    if ( wxTheApp )
+        wxTheApp->ProcessPendingEvents();
+
+    return Dispatch();
+}
+

 int wxEventLoopManual::Run()
 {
     // event loops are not recursive, you need to create another loop!
     wxCHECK_MSG( !IsRunning(), -1, _T("can't reenter a message loop") );
 
 int wxEventLoopManual::Run()
 {
     // event loops are not recursive, you need to create another loop!
     wxCHECK_MSG( !IsRunning(), -1, _T("can't reenter a message loop") );
 

-    // ProcessIdle() and Dispatch() below may throw so the code here should
+    // ProcessIdle() and ProcessEvents() below may throw so the code here should

     // be exception-safe, hence we must use local objects for all actions we
     // should undo
     wxEventLoopActivator activate(this);
 
     // we must ensure that OnExit() is called even if an exception is thrown
     // be exception-safe, hence we must use local objects for all actions we
     // should undo
     wxEventLoopActivator activate(this);
 
     // we must ensure that OnExit() is called even if an exception is thrown

-    // from inside Dispatch() but we must call it from Exit() in normal
+    // from inside ProcessEvents() but we must call it from Exit() in normal

     // situations because it is supposed to be called synchronously,
     // wxModalEventLoop depends on this (so we can't just use ON_BLOCK_EXIT or
     // something similar here)
     // situations because it is supposed to be called synchronously,
     // wxModalEventLoop depends on this (so we can't just use ON_BLOCK_EXIT or
     // something similar here)


@@ -133,14 +148,15 @@ int wxEventLoopManual::Run()
                 if ( m_shouldExit )
                 {
                     while ( Pending() )
                 if ( m_shouldExit )
                 {
                     while ( Pending() )

-                        Dispatch();
+                        ProcessEvents();

 
                     break;
                 }
 
 
                     break;
                 }
 

-                // a message came or no more idle processing to do, sit in
-                // Dispatch() waiting for the next message
-                if ( !Dispatch() )
+                // a message came or no more idle processing to do, dispatch
+                // all the pending events and call Dispatch() to wait for the
+                // next message
+                if ( !ProcessEvents() )

                 {
                     // we got WM_QUIT
                     break;
                 {
                     // we got WM_QUIT
                     break;

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index c349227bce2dc8db8cc1a231cd6f00415cfaceee..c510079d6e11e5bca02f5582e1bfa428a6ecf135 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -127,6 +127,8 @@ bool wxApp::DoIdle()
     gdk_threads_enter();
     bool needMore;
     do {
     gdk_threads_enter();
     bool needMore;
     do {

+        ProcessPendingEvents();
+

         needMore = ProcessIdle();
     } while (needMore && gtk_events_pending() == 0);
     gdk_threads_leave();
         needMore = ProcessIdle();
     } while (needMore && gtk_events_pending() == 0);
     gdk_threads_leave();