X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/06b466c74fae8f27544f143abdcabcd2385602e4..7d59475e80c3ed8b9bb002fd402d6a7cc7dc090a:/include/wx/timer.h diff --git a/include/wx/timer.h b/include/wx/timer.h index 30491db2ff..9e9ed4e523 100644 --- a/include/wx/timer.h +++ b/include/wx/timer.h @@ -7,13 +7,13 @@ // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) wxWindows team -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_TIMER_H_BASE_ #define _WX_TIMER_H_BASE_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "timerbase.h" #endif @@ -22,12 +22,24 @@ #include "wx/longlong.h" #include "wx/event.h" +#include "wx/stopwatch.h" // for backwards compatibility + +#if wxUSE_GUI && wxUSE_TIMER + // ---------------------------------------------------------------------------- // wxTimer // ---------------------------------------------------------------------------- +// more readable flags for Start(): + +// generate notifications periodically until the timer is stopped (default) +#define wxTIMER_CONTINUOUS FALSE + +// only send the notification once and then stop the timer +#define wxTIMER_ONE_SHOT TRUE + // the interface of wxTimer class -class WXDLLEXPORT wxTimerBase : public wxObject +class WXDLLEXPORT wxTimerBase : public wxEvtHandler { public: // ctors and initializers @@ -35,35 +47,29 @@ public: // default: if you don't call SetOwner(), your only chance to get timer // notifications is to override Notify() in the derived class - wxTimerBase() { Init(); SetOwner(NULL); } + wxTimerBase() { Init(); SetOwner(this); } // ctor which allows to avoid having to override Notify() in the derived // class: the owner will get timer notifications which can be handled with // EVT_TIMER - wxTimerBase(wxEvtHandler *owner, int id = -1) - { Init(); SetOwner(owner, id); } + wxTimerBase(wxEvtHandler *owner, int timerid = -1) + { Init(); SetOwner(owner, timerid); } // same as ctor above - void SetOwner(wxEvtHandler *owner, int id = -1) - { m_owner = owner; m_idTimer = id; } + void SetOwner(wxEvtHandler *owner, int timerid = -1) + { m_owner = owner; m_idTimer = timerid; } + + virtual ~wxTimerBase(); // working with the timer // ---------------------- // start the timer: if milliseconds == -1, use the same value as for the // last Start() - virtual bool Start(int milliseconds = -1, bool oneShot = FALSE) - { - if ( milliseconds != -1 ) - { - m_milli = milliseconds; - } - - m_oneShot = oneShot; - - return TRUE; - } - + // + // it is now valid to call Start() multiple times: this just restarts the + // timer if it is already running + virtual bool Start(int milliseconds = -1, bool oneShot = FALSE); // stop the timer virtual void Stop() = 0; @@ -84,11 +90,9 @@ public: // return TRUE if the timer is one shot bool IsOneShot() const { return m_oneShot; } -#if WXWIN_COMPATIBILITY_2 - // deprecated functions - int Interval() const { return GetInterval(); }; - bool OneShot() const { return IsOneShot(); } -#endif // WXWIN_COMPATIBILITY_2 + // return the timer ID + int GetId() const { return m_idTimer; } + protected: // common part of all ctors @@ -99,6 +103,8 @@ protected: int m_milli; // the timer interval bool m_oneShot; // TRUE if one shot + + DECLARE_NO_COPY_CLASS(wxTimerBase) }; // ---------------------------------------------------------------------------- @@ -111,88 +117,79 @@ protected: #include "wx/motif/timer.h" #elif defined(__WXGTK__) #include "wx/gtk/timer.h" -#elif defined(__WXQT__) - #include "wx/qt/timer.h" +#elif defined(__WXX11__) || defined(__WXMGL__) || defined(__WXCOCOA__) + #include "wx/generic/timer.h" #elif defined(__WXMAC__) #include "wx/mac/timer.h" #elif defined(__WXPM__) #include "wx/os2/timer.h" -#elif defined(__WXSTUBS__) - #include "wx/stubs/timer.h" #endif // ---------------------------------------------------------------------------- -// wxTimerEvent +// wxTimerRunner: starts the timer in its ctor, stops in the dtor // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxTimerEvent : public wxEvent +class WXDLLEXPORT wxTimerRunner { public: - wxTimerEvent(int id = 0, int interval = 0) : wxEvent(id) + wxTimerRunner(wxTimer& timer) : m_timer(timer) { } + wxTimerRunner(wxTimer& timer, int milli, bool oneShot = FALSE) + : m_timer(timer) { - m_eventType = wxEVT_TIMER; + m_timer.Start(milli, oneShot); + } - m_interval = interval; + void Start(int milli, bool oneShot = FALSE) + { + m_timer.Start(milli, oneShot); } - // accessors - int GetInterval() const { return m_interval; } + ~wxTimerRunner() + { + if ( m_timer.IsRunning() ) + { + m_timer.Stop(); + } + } private: - int m_interval; + wxTimer& m_timer; - DECLARE_DYNAMIC_CLASS(wxTimerEvent) + DECLARE_NO_COPY_CLASS(wxTimerRunner) }; -typedef void (wxEvtHandler::*wxTimerEventFunction)(wxTimerEvent&); - -#define EVT_TIMER(id, func) { wxEVT_TIMER, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTimerEventFunction) & func, NULL}, - // ---------------------------------------------------------------------------- -// wxStopWatch: measure time intervals with up to 1ms resolution +// wxTimerEvent // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxStopWatch +class WXDLLEXPORT wxTimerEvent : public wxEvent { public: - // ctor starts the stop watch - wxStopWatch() { Start(); } - void Start(long t = 0); - void Pause() { m_pause = GetElapsedTime(); } - void Resume() { Start(m_pause); } - - // get elapsed time since the last Start() or Pause() in milliseconds - long Time() const; - -protected: - // returns the elapsed time since t0 - long GetElapsedTime() const; + wxTimerEvent(int timerid = 0, int interval = 0) : wxEvent(timerid) + { + m_eventType = wxEVT_TIMER; -private: - wxLongLong m_t0; // the time of the last Start() - long m_pause; // the time of the last Pause() or 0 -}; + m_interval = interval; + } + // accessors + int GetInterval() const { return m_interval; } -// Starts a global timer -// -- DEPRECATED: use wxStopWatch instead -void WXDLLEXPORT wxStartTimer(); + // implement the base class pure virtual + virtual wxEvent *Clone() const { return new wxTimerEvent(*this); } -// Gets elapsed milliseconds since last wxStartTimer or wxGetElapsedTime -// -- DEPRECATED: use wxStopWatch instead -long WXDLLEXPORT wxGetElapsedTime(bool resetTimer = TRUE); +private: + int m_interval; -// ---------------------------------------------------------------------------- -// global time functions -// ---------------------------------------------------------------------------- + DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxTimerEvent) +}; -// Get number of seconds since local time 00:00:00 Jan 1st 1970. -long WXDLLEXPORT wxGetLocalTime(); +typedef void (wxEvtHandler::*wxTimerEventFunction)(wxTimerEvent&); -// Get number of seconds since GMT 00:00:00, Jan 1st 1970. -long WXDLLEXPORT wxGetUTCTime(); +#define EVT_TIMER(timerid, func) \ + DECLARE_EVENT_TABLE_ENTRY( wxEVT_TIMER, timerid, -1, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxTimerEventFunction, & func ), NULL), -#define wxGetCurrentTime() wxGetLocalTime() +#endif // wxUSE_GUI && wxUSE_TIMER #endif // _WX_TIMER_H_BASE_