X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/acd15a3fa015caf2d1e3213a7694b05c92d5b49c..2fda2145700445519a0ce539b04dc72bae180124:/include/wx/timer.h diff --git a/include/wx/timer.h b/include/wx/timer.h index f835029b3c..d6fcce73d0 100644 --- a/include/wx/timer.h +++ b/include/wx/timer.h @@ -13,7 +13,7 @@ #ifndef _WX_TIMER_H_BASE_ #define _WX_TIMER_H_BASE_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "timerbase.h" #endif @@ -28,6 +28,14 @@ // 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 { @@ -49,9 +57,7 @@ public: void SetOwner(wxEvtHandler *owner, int id = -1) { m_owner = owner; m_idTimer = id; } -#ifdef __DARWIN__ - virtual ~wxTimerBase() { } -#endif + virtual ~wxTimerBase(); // working with the timer // ---------------------- @@ -97,6 +103,8 @@ protected: int m_milli; // the timer interval bool m_oneShot; // TRUE if one shot + + DECLARE_NO_COPY_CLASS(wxTimerBase) }; // ---------------------------------------------------------------------------- @@ -109,14 +117,12 @@ protected: #include "wx/motif/timer.h" #elif defined(__WXGTK__) #include "wx/gtk/timer.h" -#elif defined(__WXMGL__) - #include "wx/mgl/timer.h" +#elif defined(__WXX11__) || defined(__WXMGL__) + #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 // ---------------------------------------------------------------------------- @@ -193,12 +199,18 @@ class WXDLLEXPORT wxStopWatch { public: // ctor starts the stop watch - wxStopWatch() { Start(); } - void Start(long t = 0); - void Pause() { m_pause = GetElapsedTime(); } - void Resume() { Start(m_pause); } + wxStopWatch() { m_pauseCount = 0; Start(); } - // get elapsed time since the last Start() or Pause() in milliseconds + // start the stop watch at the moment t0 + void Start(long t0 = 0); + + // pause the stop watch + void Pause() { if ( !m_pauseCount++) m_pause = GetElapsedTime(); } + + // resume it + void Resume() { if ( !--m_pauseCount ) Start(m_pause); } + + // get elapsed time since the last Start() in milliseconds long Time() const; protected: @@ -206,8 +218,14 @@ protected: long GetElapsedTime() const; private: - wxLongLong m_t0; // the time of the last Start() - long m_pause; // the time of the last Pause() or 0 + // the time of the last Start() + wxLongLong m_t0; + + // the time of the last Pause() (only valid if m_pauseCount > 0) + long m_pause; + + // if > 0, the stop watch is paused, otherwise it is running + int m_pauseCount; }; #endif // wxUSE_STOPWATCH