return true if we did anything in NotifyExpired()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57570 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/unix/private/timer.h b/include/wx/unix/private/timer.h
index 535ba7db95b3e6abc1b7f429bcc239c4945918ff..2249fe5c2ead33be2850f96cb4c4a7bcbf5f6dd6 100644 (file)
--- a/include/wx/unix/private/timer.h
+++ b/include/wx/unix/private/timer.h
@@ -110,8 +110,9 @@ public:
     // it returns false if there are no timers
     bool GetNext(wxUsecClock_t *remaining) const;
 
-    // trigger the timer event for all timers which have expired
-    void NotifyExpired();
+    // trigger the timer event for all timers which have expired, return true
+    // if any did
+    bool NotifyExpired();
 
 private:
     // ctor and dtor are private, this is a singleton class only created by

diff --git a/src/unix/timerunx.cpp b/src/unix/timerunx.cpp
index c3c563af04ff219d91dfd0a8c20c31f3bf94d699..d6ee503df5cf7210437ef27227140b9479f5a706 100644 (file)
--- a/src/unix/timerunx.cpp
+++ b/src/unix/timerunx.cpp
@@ -134,10 +134,12 @@ bool wxTimerScheduler::GetNext(wxUsecClock_t *remaining) const
     return true;
 }
 
-void wxTimerScheduler::NotifyExpired()
+bool wxTimerScheduler::NotifyExpired()
 {
     if ( m_timers.empty() )
-      return;
+      return false;
+
+    bool notified = false;
 
     const wxUsecClock_t now = wxGetLocalTimeUsec();
 
@@ -182,7 +184,10 @@ void wxTimerScheduler::NotifyExpired()
 
         // and finally notify the timer
         timer->Notify();
+        notified = true;
     }
+
+    return notified;
 }
 
 // ============================================================================