added MSLU reference to wxUSE_UNICODE

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

diff --git a/include/wx/timer.h b/include/wx/timer.h
index b5b5cfab04abffd7c631955c57ea8df9bf6588a3..d6fcce73d0847a5a198f43db258f469b2b045e3d 100644 (file)
--- a/include/wx/timer.h
+++ b/include/wx/timer.h
@@ -13,7 +13,7 @@
 #ifndef _WX_TIMER_H_BASE_
 #define _WX_TIMER_H_BASE_
 
 #ifndef _WX_TIMER_H_BASE_
 #define _WX_TIMER_H_BASE_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

     #pragma interface "timerbase.h"
 #endif
 
     #pragma interface "timerbase.h"
 #endif
 


@@ -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
 {


@@ -95,6 +103,8 @@ protected:
 
     int     m_milli;        // the timer interval
     bool    m_oneShot;      // TRUE if one shot
 
     int     m_milli;        // the timer interval
     bool    m_oneShot;      // TRUE if one shot

+
+    DECLARE_NO_COPY_CLASS(wxTimerBase)

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -107,16 +117,12 @@ 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(__WXX11__)
-    #include "wx/x11/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(__WXMAC__)
     #include "wx/mac/timer.h"
 #elif defined(__WXPM__)
     #include "wx/os2/timer.h"

-#elif defined(__WXSTUBS__)
-    #include "wx/stubs/timer.h"

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -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