fix memory leak while testing for correct Clone() implementation (closes #10304)

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

diff --git a/src/unix/evtloopunix.cpp b/src/unix/evtloopunix.cpp
index 76272844d3ea02f1a4c3d720cd591f1c6b5a7665..7f27c1c2a216acba8033c177be65510ad074e52d 100644 (file)
--- a/src/unix/evtloopunix.cpp
+++ b/src/unix/evtloopunix.cpp
@@ -149,40 +149,43 @@ bool wxConsoleEventLoop::Pending() const
 
 bool wxConsoleEventLoop::Dispatch()
 {
 
 bool wxConsoleEventLoop::Dispatch()
 {

-    m_dispatcher->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
 #if wxUSE_TIMER

+    // check if we need to decrease the timeout to account for a timer

     wxUsecClock_t nextTimer;
     if ( wxTimerScheduler::Get().GetNext(&nextTimer) )
     {
     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
 #endif // wxUSE_TIMER

-    {
-        timeout = wxFDIODispatcher::TIMEOUT_INFINITE;
-    }

 
 

-    m_dispatcher->Dispatch(timeout);
+    bool hadEvent = m_dispatcher->Dispatch(timeout);

 
 #if wxUSE_TIMER
 
 #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();
 }
     // call the signal handlers for any signals we caught recently
     wxTheApp->CheckSignal();
 }