projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
default style now applies to the text entered by the user as well (patch 574789)
[wxWidgets.git]
/
include
/
wx
/
timer.h
diff --git
a/include/wx/timer.h
b/include/wx/timer.h
index f835029b3cab13bc40386033dc1681cb328f2e52..115c9c33f716db2483421a1956ff258e0492dc19 100644
(file)
--- a/
include/wx/timer.h
+++ b/
include/wx/timer.h
@@
-28,6
+28,14
@@
// wxTimer
// ----------------------------------------------------------------------------
// 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
{
// 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; }
void SetOwner(wxEvtHandler *owner, int id = -1)
{ m_owner = owner; m_idTimer = id; }
-#ifdef __DARWIN__
- virtual ~wxTimerBase() { }
-#endif
+ virtual ~wxTimerBase();
// working with the timer
// ----------------------
// working with the timer
// ----------------------
@@
-109,8
+115,8
@@
protected:
#include "wx/motif/timer.h"
#elif defined(__WXGTK__)
#include "wx/gtk/timer.h"
#include "wx/motif/timer.h"
#elif defined(__WXGTK__)
#include "wx/gtk/timer.h"
-#elif defined(__WXMGL__)
- #include "wx/
mgl
/timer.h"
+#elif defined(__WX
X11__) || defined(__WX
MGL__)
+ #include "wx/
generic
/timer.h"
#elif defined(__WXMAC__)
#include "wx/mac/timer.h"
#elif defined(__WXPM__)
#elif defined(__WXMAC__)
#include "wx/mac/timer.h"
#elif defined(__WXPM__)
@@
-193,12
+199,18
@@
class WXDLLEXPORT wxStopWatch
{
public:
// ctor starts the stop watch
{
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(); }
+
+ // start the stop watch at the moment t0
+ void
Start(long t0 = 0);
- // get elapsed time since the last Start() or Pause() in milliseconds
+ // 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:
long Time() const;
protected:
@@
-206,8
+218,14
@@
protected:
long GetElapsedTime() const;
private:
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
};
#endif // wxUSE_STOPWATCH