X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9b4da62701dbe8ccfbe447ce8d1bc77fcb40e9e5..b404a8f3b072129c107c6d9a5e0f6f53cd34807b:/src/common/stopwatch.cpp diff --git a/src/common/stopwatch.cpp b/src/common/stopwatch.cpp index 22ecaadecd..5ed9058504 100644 --- a/src/common/stopwatch.cpp +++ b/src/common/stopwatch.cpp @@ -10,7 +10,7 @@ // Created: 20.06.2003 (extracted from common/timercmn.cpp) // RCS-ID: $Id$ // Copyright: (c) 1998-2003 wxWidgets Team -// License: wxWindows license +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -79,15 +79,6 @@ #include #endif -#ifdef __WXMAC__ -#ifndef __DARWIN__ - #include - #include -#else - #include -#endif -#endif - #ifdef __WXPALMOS__ #include #include @@ -285,26 +276,6 @@ wxLongLong wxGetLocalTimeMillis() (void)::ftime(&tp); val *= tp.time; return (val + tp.millitm); -#elif defined(__WXMAC__) - - static UInt64 gMilliAtStart = 0; - - Nanoseconds upTime = AbsoluteToNanoseconds( UpTime() ); - - if ( gMilliAtStart == 0 ) - { - time_t start = time(NULL); - gMilliAtStart = ((UInt64) start) * 1000000L; - gMilliAtStart -= upTime.lo / 1000 ; - gMilliAtStart -= ( ( (UInt64) upTime.hi ) << 32 ) / (1000 * 1000); - } - - UInt64 millival = gMilliAtStart; - millival += upTime.lo / (1000 * 1000); - millival += ( ( (UInt64) upTime.hi ) << 32 ) / (1000 * 1000); - val = millival; - - return val; #else // no gettimeofday() nor ftime() // We use wxGetLocalTime() to get the seconds since // 00:00:00 Jan 1st 1970 and then whatever is available