synchronize GTK2 minimum version in docs

[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 535ba7db95b3e6abc1b7f429bcc239c4945918ff..ceb107c3b16ee2d9428e12b684fd2b2cb8602d6e 100644 (file)
--- a/include/wx/unix/private/timer.h
+++ b/include/wx/unix/private/timer.h
@@ -23,7 +23,9 @@ typedef wxMilliClock_t wxUsecClock_t;
 // wxTimer implementation class for Unix platforms
 // ----------------------------------------------------------------------------
 
 // 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);
 {
 public:
     wxUnixTimerImpl(wxTimer *timer);


@@ -37,7 +39,7 @@ public:
     // timer is running
     void MarkStopped()
     {
     // 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;
     }
 
         m_isRunning = false;
     }


@@ -110,8 +112,9 @@ public:
     // it returns false if there are no timers
     bool GetNext(wxUsecClock_t *remaining) const;
 
     // 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
 
 private:
     // ctor and dtor are private, this is a singleton class only created by


@@ -131,12 +134,6 @@ private:
     static wxTimerScheduler *ms_instance;
 };
 
     static wxTimerScheduler *ms_instance;
 };
 

-// this helper function currently only exists for Unix platforms but could be
-// moved to wx/stopwatch.h if it turns out to be useful elsewhere
-//
-// returns the number of microseconds since the Epoch
-extern wxUsecClock_t wxGetLocalTimeUsec();
-

 #endif // wxUSE_TIMER
 
 #endif // _WX_UNIX_PRIVATE_TIMER_H_
 #endif // wxUSE_TIMER
 
 #endif // _WX_UNIX_PRIVATE_TIMER_H_