Can now skip default manifest inclusion by defining wxUSE_NO_MANIFEST

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

diff --git a/include/wx/timer.h b/include/wx/timer.h
index 802544a91bbfafece940bd57215624a578c1d6ad..33042164ed0b1ffb25581e7bd945d6ed3aed8cb2 100644 (file)
--- 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
 // 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_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #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
 


@@ -22,12 +22,20 @@
 #include "wx/longlong.h"
 #include "wx/event.h"
 
 #include "wx/longlong.h"
 #include "wx/event.h"
 

-#if wxUSE_GUI
+#if wxUSE_GUI && wxUSE_TIMER

 
 // ----------------------------------------------------------------------------
 // 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,6 +57,8 @@ 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; }
 

+    virtual ~wxTimerBase();
+

     // working with the timer
     // ----------------------
 
     // working with the timer
     // ----------------------
 


@@ -93,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)

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


@@ -105,14 +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(__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(__WXMAC__)
     #include "wx/mac/timer.h"
 #elif defined(__WXPM__)
     #include "wx/os2/timer.h"

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

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


@@ -163,6 +173,9 @@ public:
     // accessors
     int GetInterval() const { return m_interval; }
 
     // accessors
     int GetInterval() const { return m_interval; }
 

+    // implement the base class pure virtual
+    virtual wxEvent *Clone() const { return new wxTimerEvent(*this); }
+

 private:
     int m_interval;
 
 private:
     int m_interval;
 


@@ -172,24 +185,43 @@ private:
 typedef void (wxEvtHandler::*wxTimerEventFunction)(wxTimerEvent&);
 
 #define EVT_TIMER(id, func) \
 typedef void (wxEvtHandler::*wxTimerEventFunction)(wxTimerEvent&);
 
 #define EVT_TIMER(id, func) \

-    wxEventTableEntry( wxEVT_TIMER, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTimerEventFunction) & func, NULL),
+    DECLARE_EVENT_TABLE_ENTRY( wxEVT_TIMER, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTimerEventFunction) & func, NULL),

 
 

-#endif // wxUSE_GUI
+#endif // wxUSE_GUI && wxUSE_TIMER

 
 // ----------------------------------------------------------------------------
 // wxStopWatch: measure time intervals with up to 1ms resolution
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxStopWatch: measure time intervals with up to 1ms resolution
 // ----------------------------------------------------------------------------
 

+#if wxUSE_STOPWATCH
+

 class WXDLLEXPORT wxStopWatch
 {
 public:
     // ctor starts the stop watch
 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(); }
+
+    // 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()
+    {
+        wxASSERT_MSG( m_pauseCount > 0,
+                      _T("Resuming stop watch which is not paused") );
+
+        if ( !--m_pauseCount )
+            Start(m_pause);
+    }
+
+    // get elapsed time since the last Start() in milliseconds

     long Time() const;
 
 protected:
     long Time() const;
 
 protected:


@@ -197,10 +229,19 @@ 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
+
+#if wxUSE_LONGLONG

 
 // Starts a global timer
 // -- DEPRECATED: use wxStopWatch instead
 
 // Starts a global timer
 // -- DEPRECATED: use wxStopWatch instead


@@ -210,6 +251,8 @@ void WXDLLEXPORT wxStartTimer();
 // -- DEPRECATED: use wxStopWatch instead
 long WXDLLEXPORT wxGetElapsedTime(bool resetTimer = TRUE);
 
 // -- DEPRECATED: use wxStopWatch instead
 long WXDLLEXPORT wxGetElapsedTime(bool resetTimer = TRUE);
 

+#endif // wxUSE_LONGLONG
+

 // ----------------------------------------------------------------------------
 // global time functions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // global time functions
 // ----------------------------------------------------------------------------


@@ -220,8 +263,10 @@ extern long WXDLLEXPORT wxGetLocalTime();
 // Get number of seconds since GMT 00:00:00, Jan 1st 1970.
 extern long WXDLLEXPORT wxGetUTCTime();
 
 // Get number of seconds since GMT 00:00:00, Jan 1st 1970.
 extern long WXDLLEXPORT wxGetUTCTime();
 

+#if wxUSE_LONGLONG

 // Get number of milliseconds since local time 00:00:00 Jan 1st 1970
 extern wxLongLong WXDLLEXPORT wxGetLocalTimeMillis();
 // Get number of milliseconds since local time 00:00:00 Jan 1st 1970
 extern wxLongLong WXDLLEXPORT wxGetLocalTimeMillis();

+#endif // wxUSE_LONGLONG

 
 #define wxGetCurrentTime() wxGetLocalTime()
 
 
 #define wxGetCurrentTime() wxGetLocalTime()