reverted yet another accidental commit of testing code in r57505

[wxWidgets.git] / src / unix / evtloopunix.cpp

diff --git a/src/unix/evtloopunix.cpp b/src/unix/evtloopunix.cpp
index 76272844d3ea02f1a4c3d720cd591f1c6b5a7665..fc1f469ae427e6f626902b971c2377d0a119836d 100644 (file)
--- a/src/unix/evtloopunix.cpp
+++ b/src/unix/evtloopunix.cpp
@@ -148,18 +148,6 @@ bool wxConsoleEventLoop::Pending() const
 }
 
 bool wxConsoleEventLoop::Dispatch()
 }
 
 bool wxConsoleEventLoop::Dispatch()

-{
-    m_dispatcher->Dispatch();
-    wxTheApp->ProcessPendingEvents();
-    return true;
-}
-
-void wxConsoleEventLoop::WakeUp()
-{
-    m_wakeupPipe.WakeUp();
-}
-
-void wxConsoleEventLoop::OnNextIteration()

 {
     // calculate the timeout until the next timer expiration
     int timeout;
 {
     // calculate the timeout until the next timer expiration
     int timeout;


@@ -183,6 +171,17 @@ void wxConsoleEventLoop::OnNextIteration()
     wxTimerScheduler::Get().NotifyExpired();
 #endif
 
     wxTimerScheduler::Get().NotifyExpired();
 #endif
 

+    wxTheApp->ProcessPendingEvents();
+    return true;
+}
+
+void wxConsoleEventLoop::WakeUp()
+{
+    m_wakeupPipe.WakeUp();
+}
+
+void wxConsoleEventLoop::OnNextIteration()
+{

     // call the signal handlers for any signals we caught recently
     wxTheApp->CheckSignal();
 }
     // call the signal handlers for any signals we caught recently
     wxTheApp->CheckSignal();
 }