typo fix

[wxWidgets.git] / src / common / timercmn.cpp

diff --git a/src/common/timercmn.cpp b/src/common/timercmn.cpp
index 5f08b29800ca5c28fb05cb293a2d1dabea3ec88d..b6e7e918dd3b551f6459bc6615057057f1f70c20 100644 (file)
--- a/src/common/timercmn.cpp
+++ b/src/common/timercmn.cpp
@@ -163,7 +163,7 @@ bool wxTimerBase::Start(int milliseconds, bool oneShot)
 // wxStopWatch
 // ----------------------------------------------------------------------------
 
-#if wxUSE_LONGLONG
+#if wxUSE_STOPWATCH && wxUSE_LONGLONG
 
 void wxStopWatch::Start(long t)
 {
@@ -346,20 +346,24 @@ wxLongLong wxGetLocalTimeMillis()
     return (val + tp.millitm);
 #elif defined(__WXMAC__)
     
-    UInt64 gMilliAtStart = 0 ;
-    Nanoseconds upTime = AbsoluteToNanoseconds( UpTime() ) ;
+    static UInt64 gMilliAtStart = 0;
+
+    Nanoseconds upTime = AbsoluteToNanoseconds( UpTime() );
+
     if ( gMilliAtStart == 0 )
     {
-        time_t start = time(NULL) ;
-        gMilliAtStart = ((UInt64) start) * 1000L ;
+        time_t start = time(NULL);
+        gMilliAtStart = ((UInt64) start) * 1000000L;
         gMilliAtStart -= upTime.lo / 1000 ;
-        gMilliAtStart -= ( ( (UInt64) upTime.hi ) << 32 ) / 1000 ;
+        gMilliAtStart -= ( ( (UInt64) upTime.hi ) << 32 ) / (1000 * 1000);
     }
-    UInt64 millival = gMilliAtStart ;
-    millival += upTime.lo / 1000 ;
-    millival += ( ( (UInt64) upTime.hi ) << 32 ) / 1000 ;
-    val = millival ;
-    return val ;
+
+    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
@@ -400,5 +404,5 @@ wxLongLong wxGetLocalTimeMillis()
 #endif // time functions
 }
 
-#endif // wxUSE_LONGLONG
+#endif // #if wxUSE_STOPWATCH && wxUSE_LONGLONG