Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/stopwatch.h b/include/wx/stopwatch.h
index 791eda95069450e9fcfd0bdd0b0104ba3375d925..9ef3b1fc0535b3041dcfb9a079ce0b9349feae63 100644 (file)
--- a/include/wx/stopwatch.h
+++ b/include/wx/stopwatch.h
@@ -102,45 +102,4 @@ private:
 
 #endif // wxUSE_LONGLONG && WXWIN_COMPATIBILITY_2_6
 
 
 #endif // wxUSE_LONGLONG && WXWIN_COMPATIBILITY_2_6
 

-// ----------------------------------------------------------------------------
-// global time functions
-// ----------------------------------------------------------------------------
-
-// Get number of seconds since local time 00:00:00 Jan 1st 1970.
-extern long WXDLLIMPEXP_BASE wxGetLocalTime();
-
-// Get number of seconds since GMT 00:00:00, Jan 1st 1970.
-extern long WXDLLIMPEXP_BASE wxGetUTCTime();
-
-#if wxUSE_LONGLONG
-    typedef wxLongLong wxMilliClock_t;
-    inline long wxMilliClockToLong(wxLongLong ll) { return ll.ToLong(); }
-#else
-    typedef double wxMilliClock_t;
-    inline long wxMilliClockToLong(double d) { return wx_truncate_cast(long, d); }
-#endif // wxUSE_LONGLONG
-
-// Get number of milliseconds since local time 00:00:00 Jan 1st 1970
-extern wxMilliClock_t WXDLLIMPEXP_BASE wxGetLocalTimeMillis();
-
-#if wxUSE_LONGLONG
-
-// Get the number of milliseconds or microseconds since the Epoch.
-wxLongLong WXDLLIMPEXP_BASE wxGetUTCTimeMillis();
-wxLongLong WXDLLIMPEXP_BASE wxGetUTCTimeUSec();
-
-#endif // wxUSE_LONGLONG
-
-#define wxGetCurrentTime() wxGetLocalTime()
-
-// on some really old systems gettimeofday() doesn't have the second argument,
-// define wxGetTimeOfDay() to hide this difference
-#ifdef HAVE_GETTIMEOFDAY
-    #ifdef WX_GETTIMEOFDAY_NO_TZ
-        #define wxGetTimeOfDay(tv)      gettimeofday(tv)
-    #else
-        #define wxGetTimeOfDay(tv)      gettimeofday((tv), NULL)
-    #endif
-#endif // HAVE_GETTIMEOFDAY
-

 #endif // _WX_STOPWATCH_H_
 #endif // _WX_STOPWATCH_H_