Move code removing "-psn_xxx" command line arguments to common code.

[wxWidgets.git] / interface / wx / stopwatch.h

diff --git a/interface/wx/stopwatch.h b/interface/wx/stopwatch.h
index 3e37dacd1f7adfb81a00d0fc908276190e0e1bee..c08d15d28d58f5521fd1bf6f9135fda3570d02fc 100644 (file)
--- a/interface/wx/stopwatch.h
+++ b/interface/wx/stopwatch.h
@@ -2,7 +2,6 @@
 // Name:        stopwatch.h
 // Purpose:     interface of wxStopWatch
 // Author:      wxWidgets team
 // Name:        stopwatch.h
 // Purpose:     interface of wxStopWatch
 // Author:      wxWidgets team

-// RCS-ID:      $Id$

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -25,7 +24,7 @@
         wxLogMessage("And calling it twice took $ldms in all", sw.Time());
     @endcode
 
         wxLogMessage("And calling it twice took $ldms in all", sw.Time());
     @endcode
 

-    Since wxWidgets 2.9.3 this class uses @c ::QueryPerformanceCounter()
+    Since wxWidgets 2.9.3 this class uses @c QueryPerformanceCounter()

     function under MSW to measure the elapsed time. It provides higher
     precision than the usual timer functions but can suffer from bugs in its
     implementation in some Windows XP versions. If you encounter such problems,
     function under MSW to measure the elapsed time. It provides higher
     precision than the usual timer functions but can suffer from bugs in its
     implementation in some Windows XP versions. If you encounter such problems,


@@ -61,6 +60,10 @@ public:
 
     /**
         (Re)starts the stop watch with a given initial value.
 
     /**
         (Re)starts the stop watch with a given initial value.

+
+        The stopwatch will always be running after calling Start(), even if
+        Pause() had been called before and even if it had been called multiple
+        times.

     */
     void Start(long milliseconds = 0);
 
     */
     void Start(long milliseconds = 0);
 


@@ -84,59 +87,3 @@ public:
     wxLongLong TimeInMicro() const;
 };
 
     wxLongLong TimeInMicro() const;
 };
 

-
-
-// ============================================================================
-// Global functions/macros
-// ============================================================================
-
-/** @addtogroup group_funcmacro_time */
-//@{
-
-/**
-    Returns the number of seconds since local time 00:00:00 Jan 1st 1970.
-
-    @see wxDateTime::Now()
-
-    @header{wx/stopwatch.h}
-*/
-long wxGetLocalTime();
-
-/**
-    Returns the number of milliseconds since local time 00:00:00 Jan 1st 1970.
-
-    The use of wxGetUTCTimeMillis() is preferred as it provides a usually
-    (except for changes to the system time) monotonic clock which the local
-    time also changes whenever DST begins or ends.
-
-    @see wxDateTime::Now(), wxGetUTCTimeMillis(), wxGetUTCTimeUSec()
-
-    @header{wx/stopwatch.h}
-*/
-wxLongLong wxGetLocalTimeMillis();
-
-/**
-    Returns the number of seconds since GMT 00:00:00 Jan 1st 1970.
-
-    @see wxDateTime::Now()
-
-    @header{wx/stopwatch.h}
-*/
-long wxGetUTCTime();
-
-/**
-    Returns the number of milliseconds since GMT 00:00:00 Jan 1st 1970.
-
-    @since 2.9.3
- */
-wxLongLong wxGetUTCTimeMillis();
-
-/**
-    Returns the number of microseconds since GMT 00:00:00 Jan 1st 1970.
-
-    @since 2.9.3
- */
-wxLongLong wxGetUTCTimeUSec();
-
-//@}
-