X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2d1593cd4b21dda37236dee8c5057343e41656cd..f7ae43f080576ef142d3884073df298294860328:/src/unix/evtloopunix.cpp

diff --git a/src/unix/evtloopunix.cpp b/src/unix/evtloopunix.cpp
index 5bd8b1050f..7f27c1c2a2 100644
--- a/src/unix/evtloopunix.cpp
+++ b/src/unix/evtloopunix.cpp
@@ -27,6 +27,7 @@
 #endif
 
 #include <errno.h>
+#include "wx/apptrait.h"
 #include "wx/evtloop.h"
 #include "wx/thread.h"
 #include "wx/module.h"
@@ -148,41 +149,51 @@ bool wxConsoleEventLoop::Pending() const
 
 bool wxConsoleEventLoop::Dispatch()
 {
-    wxTheApp->ProcessPendingEvents();
-    return true;
-}
+    DispatchTimeout(wxFDIODispatcher::TIMEOUT_INFINITE);
 
-void wxConsoleEventLoop::WakeUp()
-{
-    m_wakeupPipe.WakeUp();
+    return true;
 }
 
-void wxConsoleEventLoop::OnNextIteration()
+int wxConsoleEventLoop::DispatchTimeout(unsigned long timeout)
 {
-    // calculate the timeout until the next timer expiration
-    int timeout;
-
 #if wxUSE_TIMER
+    // check if we need to decrease the timeout to account for a timer
     wxUsecClock_t nextTimer;
     if ( wxTimerScheduler::Get().GetNext(&nextTimer) )
     {
-        // timeout is in ms
-        timeout = (nextTimer / 1000).ToLong();
+        unsigned long timeUntilNextTimer = wxMilliClockToLong(nextTimer / 1000);
+        if ( timeUntilNextTimer < timeout )
+            timeout = timeUntilNextTimer;
     }
-    else // no timers, we can block forever
 #endif // wxUSE_TIMER
-    {
-        timeout = wxFDIODispatcher::TIMEOUT_INFINITE;
-    }
 
-    m_dispatcher->Dispatch(timeout);
+    bool hadEvent = m_dispatcher->Dispatch(timeout);
 
 #if wxUSE_TIMER
-    wxTimerScheduler::Get().NotifyExpired();
-#endif
+    if ( wxTimerScheduler::Get().NotifyExpired() )
+        hadEvent = true;
+#endif // wxUSE_TIMER
+
+    wxTheApp->ProcessPendingEvents();
+
+    return hadEvent ? 1 : -1;
+}
+
+void wxConsoleEventLoop::WakeUp()
+{
+    m_wakeupPipe.WakeUp();
+}
 
+void wxConsoleEventLoop::OnNextIteration()
+{
     // call the signal handlers for any signals we caught recently
     wxTheApp->CheckSignal();
 }
 
+
+wxEventLoopBase *wxConsoleAppTraits::CreateEventLoop()
+{
+    return new wxEventLoop();
+}
+
 #endif // wxUSE_CONSOLE_EVENTLOOP