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

Applied patch [ 706329 ] [wxMac] Fixes wxGetLocalTimeMillis

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19963 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-04-03 13:01:59 +00:00
parent 715d7d25b3
commit 72c30d6572
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/common/timercmn.cpp
View File

@@ -346,20 +346,24 @@ wxLongLong wxGetLocalTimeMillis()
return (val + tp.millitm); return (val + tp.millitm);
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
UInt64 gMilliAtStart = 0 ; static UInt64 gMilliAtStart = 0;
Nanoseconds upTime = AbsoluteToNanoseconds( UpTime() ) ;
Nanoseconds upTime = AbsoluteToNanoseconds( UpTime() );
if ( gMilliAtStart == 0 ) if ( gMilliAtStart == 0 )
{ {
time_t start = time(NULL) ; time_t start = time(NULL);
gMilliAtStart = ((UInt64) start) * 1000L ; gMilliAtStart = ((UInt64) start) * 1000000L;
gMilliAtStart -= upTime.lo / 1000 ; gMilliAtStart -= upTime.lo / 1000 ;
gMilliAtStart -= ( ( (UInt64) upTime.hi ) << 32 ) / 1000 ; gMilliAtStart -= ( ( (UInt64) upTime.hi ) << 32 ) / (1000 * 1000);
} }
UInt64 millival = gMilliAtStart ;
millival += upTime.lo / 1000 ; UInt64 millival = gMilliAtStart;
millival += ( ( (UInt64) upTime.hi ) << 32 ) / 1000 ; millival += upTime.lo / (1000 * 1000);
val = millival ; millival += ( ( (UInt64) upTime.hi ) << 32 ) / (1000 * 1000);
return val ; val = millival;
return val;
#else // no gettimeofday() nor ftime() #else // no gettimeofday() nor ftime()
// We use wxGetLocalTime() to get the seconds since // We use wxGetLocalTime() to get the seconds since
// 00:00:00 Jan 1st 1970 and then whatever is available // 00:00:00 Jan 1st 1970 and then whatever is available