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

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

diff --git a/src/unix/timerunx.cpp b/src/unix/timerunx.cpp
index c7734b423572fe0aa72c5b023335eb5be01019b8..d6ee503df5cf7210437ef27227140b9479f5a706 100644 (file)
--- a/src/unix/timerunx.cpp
+++ b/src/unix/timerunx.cpp
@@ -18,6 +18,8 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

+#if wxUSE_TIMER
+

 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/module.h"
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/module.h"


@@ -27,6 +29,7 @@
     #include "wx/event.h"
 #endif
 
     #include "wx/event.h"
 #endif
 

+#include "wx/apptrait.h"

 #include "wx/longlong.h"
 
 #include <sys/time.h>
 #include "wx/longlong.h"
 
 #include <sys/time.h>


@@ -35,7 +38,7 @@
 #include "wx/unix/private/timer.h"
 
 #include "wx/listimpl.cpp"
 #include "wx/unix/private/timer.h"
 
 #include "wx/listimpl.cpp"

-WX_DEFINE_LIST(wxTimerList);
+WX_DEFINE_LIST(wxTimerList)

 
 // trace mask for the debugging messages used here
 #define wxTrace_Timer wxT("timer")
 
 // trace mask for the debugging messages used here
 #define wxTrace_Timer wxT("timer")


@@ -131,10 +134,12 @@ bool wxTimerScheduler::GetNext(wxUsecClock_t *remaining) const
     return true;
 }
 
     return true;
 }
 

-void wxTimerScheduler::NotifyExpired()
+bool wxTimerScheduler::NotifyExpired()

 {
     if ( m_timers.empty() )
 {
     if ( m_timers.empty() )

-      return;
+      return false;
+
+    bool notified = false;

 
     const wxUsecClock_t now = wxGetLocalTimeUsec();
 
 
     const wxUsecClock_t now = wxGetLocalTimeUsec();
 


@@ -169,13 +174,20 @@ void wxTimerScheduler::NotifyExpired()
         }
         else // reschedule the next timer expiration
         {
         }
         else // reschedule the next timer expiration
         {

-            s->m_expiration += timer->GetInterval()*1000;
+            // always keep the expiration time in the future, i.e. base it on
+            // the current time instead of just offsetting it from the current
+            // expiration time because it could happen that we're late and the
+            // current expiration time is (far) in the past
+            s->m_expiration = now + timer->GetInterval()*1000;

             DoAddTimer(s);
         }
 
         // and finally notify the timer
         timer->Notify();
             DoAddTimer(s);
         }
 
         // and finally notify the timer
         timer->Notify();

+        notified = true;

     }
     }

+
+    return notified;

 }
 
 // ============================================================================
 }
 
 // ============================================================================


@@ -254,3 +266,10 @@ wxUsecClock_t wxGetLocalTimeUsec()
     return wxGetLocalTimeMillis() * 1000L;
 }
 
     return wxGetLocalTimeMillis() * 1000L;
 }
 

+wxTimerImpl *wxConsoleAppTraits::CreateTimerImpl(wxTimer *timer)
+{
+    return new wxUnixTimerImpl(timer);
+}
+
+#endif // wxUSE_TIMER
+