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 c147a7651d432f36266f923a216574d2ff2a5d74..fc1f469ae427e6f626902b971c2377d0a119836d 100644 (file)
--- a/src/unix/evtloopunix.cpp
+++ b/src/unix/evtloopunix.cpp
@@ -27,6 +27,7 @@
 #endif
 
 #include <errno.h>
 #endif
 
 #include <errno.h>

+#include "wx/apptrait.h"

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


@@ -147,17 +148,6 @@ bool wxConsoleEventLoop::Pending() const
 }
 
 bool wxConsoleEventLoop::Dispatch()
 }
 
 bool wxConsoleEventLoop::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;


@@ -175,14 +165,31 @@ void wxConsoleEventLoop::OnNextIteration()
         timeout = wxFDIODispatcher::TIMEOUT_INFINITE;
     }
 
         timeout = wxFDIODispatcher::TIMEOUT_INFINITE;
     }
 

-    m_dispatcher->RunLoop(timeout);
+    m_dispatcher->Dispatch(timeout);

 
 #if wxUSE_TIMER
     wxTimerScheduler::Get().NotifyExpired();
 #endif
 
 
 #if wxUSE_TIMER
     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();
 }
 

+
+wxEventLoopBase *wxConsoleAppTraits::CreateEventLoop()
+{
+    return new wxEventLoop();
+}
+

 #endif // wxUSE_CONSOLE_EVENTLOOP
 #endif // wxUSE_CONSOLE_EVENTLOOP