avoid causing idle event from GetValue(), fixes #11013

[wxWidgets.git] / include / wx / unix / private / timer.h

diff --git a/include/wx/unix/private/timer.h b/include/wx/unix/private/timer.h
index 17776738c99c9a2054faac9557167cb9a6286a40..d879f3640d594cf5a09eb61998cb0e1e46a8413b 100644 (file)
--- a/include/wx/unix/private/timer.h
+++ b/include/wx/unix/private/timer.h
@@ -11,6 +11,8 @@
 #ifndef _WX_UNIX_PRIVATE_TIMER_H_
 #define _WX_UNIX_PRIVATE_TIMER_H_
 
+#if wxUSE_TIMER
+
 #include "wx/private/timer.h"
 
 // the type used for milliseconds is large enough for microseconds too but
@@ -21,7 +23,9 @@ typedef wxMilliClock_t wxUsecClock_t;
 // wxTimer implementation class for Unix platforms
 // ----------------------------------------------------------------------------
 
-class wxUnixTimerImpl : public wxTimerImpl
+// NB: we have to export at least this symbol from the shared library, because
+//     it's used by wxDFB's wxCore
+class WXDLLIMPEXP_BASE wxUnixTimerImpl : public wxTimerImpl
 {
 public:
     wxUnixTimerImpl(wxTimer *timer);
@@ -35,7 +39,7 @@ public:
     // timer is running
     void MarkStopped()
     {
-        wxASSERT_MSG( m_isRunning, _T("stopping non-running timer?") );
+        wxASSERT_MSG( m_isRunning, wxT("stopping non-running timer?") );
 
         m_isRunning = false;
     }
@@ -108,8 +112,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
@@ -135,4 +140,6 @@ private:
 // returns the number of microseconds since the Epoch
 extern wxUsecClock_t wxGetLocalTimeUsec();
 
+#endif // wxUSE_TIMER
+
 #endif // _WX_UNIX_PRIVATE_TIMER_H_