make cocoa mediactrl usable. Some touchups to carbon mediactrl code. Add notebook...

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

diff --git a/src/common/stopwatch.cpp b/src/common/stopwatch.cpp
index ed4987fc09160338e8eecd8c835b740bf6beec8d..cb1c69a17a78a09d67a102caa36492866ed394ee 100644 (file)
--- a/src/common/stopwatch.cpp
+++ b/src/common/stopwatch.cpp
@@ -9,7 +9,7 @@
 // Modified by:
 // Created:     20.06.2003 (extracted from common/timercmn.cpp)
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     20.06.2003 (extracted from common/timercmn.cpp)
 // RCS-ID:      $Id$

-// Copyright:   (c) 1998-2003 wxWindows Team
+// Copyright:   (c) 1998-2003 wxWidgets Team

 // License:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 
 // License:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 


@@ -193,12 +193,7 @@ long wxGetLocalTime()
 // Get UTC time as seconds since 00:00:00, Jan 1st 1970
 long wxGetUTCTime()
 {
 // Get UTC time as seconds since 00:00:00, Jan 1st 1970
 long wxGetUTCTime()
 {

-#ifdef _MSC_VER
-       unsigned
-#endif
-    long timenow = 0;
-    time(&timenow);
-    return timenow;
+    return (long)time(NULL);

 }
 
 #if wxUSE_LONGLONG
 }
 
 #if wxUSE_LONGLONG


@@ -227,7 +222,7 @@ wxLongLong wxGetLocalTimeMillis()
     wxLongLong now( nowft.dwHighDateTime, nowft.dwLowDateTime );   // time in 100 nanoseconds
 
     return ( now - then ) / 10000.0;  // time from 00:00:00 Jan 1st 1970 to now in milliseconds
     wxLongLong now( nowft.dwHighDateTime, nowft.dwLowDateTime );   // time in 100 nanoseconds
 
     return ( now - then ) / 10000.0;  // time from 00:00:00 Jan 1st 1970 to now in milliseconds

-    
+

 #elif defined(HAVE_GETTIMEOFDAY)
     struct timeval tp;
     if ( wxGetTimeOfDay(&tp, (struct timezone *)NULL) != -1 )
 #elif defined(HAVE_GETTIMEOFDAY)
     struct timeval tp;
     if ( wxGetTimeOfDay(&tp, (struct timezone *)NULL) != -1 )


@@ -249,7 +244,7 @@ wxLongLong wxGetLocalTimeMillis()
     val *= tp.time;
     return (val + tp.millitm);
 #elif defined(__WXMAC__)
     val *= tp.time;
     return (val + tp.millitm);
 #elif defined(__WXMAC__)

-    
+

     static UInt64 gMilliAtStart = 0;
 
     Nanoseconds upTime = AbsoluteToNanoseconds( UpTime() );
     static UInt64 gMilliAtStart = 0;
 
     Nanoseconds upTime = AbsoluteToNanoseconds( UpTime() );