No changes, just move time functions from wx/stopwatch.h to wx/time.h.
Preserve compatibility by including wx/time.h from wx/stopwatch.h but put all the time-related functions in a more logical place. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69838 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		| @@ -11,7 +11,46 @@ | ||||
| #ifndef _WX_TIME_H_ | ||||
| #define _WX_TIME_H_ | ||||
|  | ||||
| #include "wx/longlong.h" | ||||
|  | ||||
| // Returns the difference between UTC and local time in seconds. | ||||
| WXDLLIMPEXP_BASE int wxGetTimeZone(); | ||||
|  | ||||
| // 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_TIME_H_ | ||||
|   | ||||
		Reference in New Issue
	
	Block a user