remove ancient defines left over from GTK1

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

diff --git a/interface/wx/stopwatch.h b/interface/wx/stopwatch.h
index 3e37dacd1f7adfb81a00d0fc908276190e0e1bee..096bd36ca63b34050d9e4478b1ffe4e42a4116b5 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
 /////////////////////////////////////////////////////////////////////////////
 


@@ -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();
-
-//@}
-