Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merged 2.2 branch

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2000-07-15 19:51:35 +00:00
parent 8a693e6e04
commit f6bcfd974e
1835 changed files with 237729 additions and 67990 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/common/timercmn.cpp
View File

@@ -88,12 +88,6 @@
#endif
#endif // HAVE_GETTIMEOFDAY
// ----------------------------------------------------------------------------
// prototypes
// ----------------------------------------------------------------------------
wxLongLong wxGetLocalTimeMillis();
// ============================================================================
// implementation
// ============================================================================
@@ -274,7 +268,7 @@ wxLongLong wxGetLocalTimeMillis()
(void)ftime(&tp);
val *= tp.time;
return (val + tp.millitm);
#else
#else // no gettimeofday() nor ftime()
// We use wxGetLocalTime() to get the seconds since
// 00:00:00 Jan 1st 1970 and then whatever is available
// to get millisecond resolution.
@@ -286,21 +280,38 @@ wxLongLong wxGetLocalTimeMillis()
val *= wxGetLocalTime();
#if defined(__VISAGECPP__)
// If your platform/compiler needs to use two different functions
// to get ms resolution, please do NOT just shut off these warnings,
// drop me a line instead at <guille@iies.es>
#warning "Possible clock skew bug in wxGetLocalTimeMillis()!"
DATETIME dt;
::DosGetDateTime(&dt);
val += (dt.hundredths*10);
#elif defined (__WIN32__)
#warning "Possible clock skew bug in wxStopWatch!"
// If your platform/compiler needs to use two different functions
// to get ms resolution, please do NOT just shut off these warnings,
// drop me a line instead at <guille@iies.es>
#warning "Possible clock skew bug in wxGetLocalTimeMillis()!"
SYSTEMTIME st;
::GetLocalTime(&st);
val += st.wMilliseconds;
#else
#if !defined(__VISUALC__) && !defined(__BORLANDC__)
#warning "wxStopWatch will be up to second resolution!"
#endif
#else // !Win32
// If your platform/compiler does not support ms resolution please
// do NOT just shut off these warnings, drop me a line instead at
// <guille@iies.es>
#if defined(__VISUALC__)
#pragma message("wxStopWatch will be up to second resolution!")
#elif defined(__BORLANDC__)
#pragma message "wxStopWatch will be up to second resolution!"
#else
#warning "wxStopWatch will be up to second resolution!"
#endif // compiler
#endif
return val;
#endif
#endif // time functions
}