From 608f8a111b6149267dc58ba87ea8de2edb550685 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 11 Feb 2006 16:38:28 +0000 Subject: [PATCH] provide wxGetLocalTimeMillis() (returning double) even if wxUSE_LONGLONG==0 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37495 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/stopwatch.h | 8 ++++++-- src/common/stopwatch.cpp | 9 ++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/include/wx/stopwatch.h b/include/wx/stopwatch.h index 19d35a168b..75f789592b 100644 --- a/include/wx/stopwatch.h +++ b/include/wx/stopwatch.h @@ -89,10 +89,14 @@ extern long WXDLLIMPEXP_BASE wxGetLocalTime(); extern long WXDLLIMPEXP_BASE wxGetUTCTime(); #if wxUSE_LONGLONG -// Get number of milliseconds since local time 00:00:00 Jan 1st 1970 -extern wxLongLong WXDLLIMPEXP_BASE wxGetLocalTimeMillis(); + typedef wxLongLong wxMilliClock_t; +#else + typedef double wxMilliClock_t; #endif // wxUSE_LONGLONG +// Get number of milliseconds since local time 00:00:00 Jan 1st 1970 +extern wxMilliClock_t WXDLLIMPEXP_BASE wxGetLocalTimeMillis(); + #define wxGetCurrentTime() wxGetLocalTime() #endif // _WX_STOPWATCH_H_ diff --git a/src/common/stopwatch.cpp b/src/common/stopwatch.cpp index cd13eb0588..9cf9902ae1 100644 --- a/src/common/stopwatch.cpp +++ b/src/common/stopwatch.cpp @@ -364,6 +364,13 @@ wxLongLong wxGetLocalTimeMillis() #endif // time functions } -#endif // wxUSE_LONGLONG +#else // !wxUSE_LONGLONG + +double wxGetLocalTimeMillis(void) +{ + return (double(clock()) / double(CLOCKS_PER_SEC)) * 1000.0; +} + +#endif // wxUSE_LONGLONG/!wxUSE_LONGLONG -- 2.45.2