millisecond resolution supported for wxMac

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15908 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/timercmn.cpp b/src/common/timercmn.cpp
index 63f12e82ce097f731f391be43308fa1ed6fd8456..93b58499e5113d3aea23ab29c414db5db86c1bcd 100644 (file)
--- a/src/common/timercmn.cpp
+++ b/src/common/timercmn.cpp
@@ -77,6 +77,10 @@
     #include <sys/timeb.h>
 #endif
 
     #include <sys/timeb.h>
 #endif
 

+#ifdef __WXMAC__
+    #include <Timer.h>
+    #include <DriverServices.h>
+#endif

 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------


@@ -331,6 +335,22 @@ wxLongLong wxGetLocalTimeMillis()
     (void)ftime(&tp);
     val *= tp.time;
     return (val + tp.millitm);
     (void)ftime(&tp);
     val *= tp.time;
     return (val + tp.millitm);

+#elif defined(__WXMAC__)
+    
+    unsigned long secs ;
+    UInt64 gMilliAtStart = 0 ;
+    Nanoseconds upTime = AbsoluteToNanoseconds( UpTime() ) ;
+    if ( gMilliAtStart == 0 )
+    {
+        time_t start = time(NULL) ;
+        gMilliAtStart = ((UInt64) start) * 1000L ;
+        gMilliAtStart -= upTime.lo / 1000 ;
+        gMilliAtStart -= ( ( (UInt64) upTime.hi ) << 32 ) / 1000 ;
+    }
+    UInt64 millival = gMilliAtStart ;
+    millival += upTime.lo / 1000 ;
+    millival += ( ( (UInt64) upTime.hi ) << 32 ) / 1000 ;
+    return millival ;

 #else // no gettimeofday() nor ftime()
     // We use wxGetLocalTime() to get the seconds since
     // 00:00:00 Jan 1st 1970 and then whatever is available
 #else // no gettimeofday() nor ftime()
     // We use wxGetLocalTime() to get the seconds since
     // 00:00:00 Jan 1st 1970 and then whatever is available