No longer use semi-static IDs for wxPropertyGrid embedded controls and tool bar tools.

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

diff --git a/src/common/stopwatch.cpp b/src/common/stopwatch.cpp
index 0739cf0f4bf2453d3d3cb456231d62176249d2e2..5ed9058504625ba60442705f5a047ce3598bff62 100644 (file)
--- a/src/common/stopwatch.cpp
+++ b/src/common/stopwatch.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        common/stopwatch.cpp
+// Name:        src/common/stopwatch.cpp
 // Purpose:     wxStopWatch and other non-GUI stuff from wx/timer.h
 // Author:
 //    Original version by Julian Smart
@@ -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
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -31,6 +31,9 @@
 #include "wx/stopwatch.h"
 
 #ifndef WX_PRECOMP
+    #ifdef __WXMSW__
+        #include "wx/msw/wrapwin.h"
+    #endif
     #include "wx/intl.h"
     #include "wx/log.h"
 #endif //WX_PRECOMP
@@ -39,10 +42,6 @@
 // System headers
 // ----------------------------------------------------------------------------
 
-#if defined(__WIN32__)
-    #include "wx/msw/wrapwin.h"
-#endif
-
 #if defined(__WIN32__) && !defined(HAVE_FTIME) && !defined(__MWERKS__) && !defined(__WXWINCE__)
     #define HAVE_FTIME
 #endif
@@ -59,12 +58,15 @@
 #   undef HAVE_GETTIMEOFDAY
 #endif
 
+#ifndef __WXPALMOS5__
 #ifndef __WXWINCE__
 #include <time.h>
 #else
 #include "wx/msw/private.h"
 #include "wx/msw/wince/time.h"
 #endif
+#endif // __WXPALMOS5__
+
 
 #if !defined(__WXMAC__) && !defined(__WXWINCE__)
     #include <sys/types.h>      // for time_t
@@ -77,36 +79,12 @@
     #include <sys/timeb.h>
 #endif
 
-#ifdef __WXMAC__
-#ifndef __DARWIN__
-    #include <Timer.h>
-    #include <DriverServices.h>
-#else
-    #include <Carbon/Carbon.h>
-#endif
-#endif
-
 #ifdef __WXPALMOS__
     #include <DateTime.h>
     #include <TimeMgr.h>
     #include <SystemMgr.h>
 #endif
 
-// ----------------------------------------------------------------------------
-// macros
-// ----------------------------------------------------------------------------
-
-// on some really old systems gettimeofday() doesn't have the second argument,
-// define wxGetTimeOfDay() to hide this difference
-#ifdef HAVE_GETTIMEOFDAY
-    #ifdef WX_GETTIMEOFDAY_NO_TZ
-        struct timezone;
-        #define wxGetTimeOfDay(tv, tz)      gettimeofday(tv)
-    #else
-        #define wxGetTimeOfDay(tv, tz)      gettimeofday((tv), (tz))
-    #endif
-#endif // HAVE_GETTIMEOFDAY
-
 // ============================================================================
 // implementation
 // ============================================================================
@@ -280,7 +258,7 @@ wxLongLong wxGetLocalTimeMillis()
 
 #elif defined(HAVE_GETTIMEOFDAY)
     struct timeval tp;
-    if ( wxGetTimeOfDay(&tp, (struct timezone *)NULL) != -1 )
+    if ( wxGetTimeOfDay(&tp) != -1 )
     {
         val *= tp.tv_sec;
         return (val + (tp.tv_usec / 1000));
@@ -298,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
@@ -371,5 +329,3 @@ double wxGetLocalTimeMillis(void)
 }
 
 #endif // wxUSE_LONGLONG/!wxUSE_LONGLONG
-
-