Fix setting the clipping region for a DC when the region is an

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

diff --git a/src/common/stopwatch.cpp b/src/common/stopwatch.cpp
index ed4987fc09160338e8eecd8c835b740bf6beec8d..6e0754d2d089cd78a1f620fa09e7ee4a7b1754fa 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
@@ -9,7 +9,7 @@
 // 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
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -28,22 +28,20 @@
     #pragma hdrstop
 #endif
 
+#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
 
-#include "wx/longlong.h"
-#include "wx/stopwatch.h"
-
 // ----------------------------------------------------------------------------
 // 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
@@ -79,8 +77,18 @@
 #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
 
 // ----------------------------------------------------------------------------
@@ -110,14 +118,48 @@
 
 void wxStopWatch::Start(long t)
 {
+#if 0
+// __WXMSW__
+    LARGE_INTEGER frequency_li;
+    ::QueryPerformanceFrequency( &frequency_li );
+    m_frequency = frequency_li.QuadPart;
+    if (m_frequency == 0)
+    {
+        m_t0 = wxGetLocalTimeMillis() - t;
+    }
+    else
+    {
+        LARGE_INTEGER counter_li;
+        ::QueryPerformanceCounter( &counter_li );
+        wxLongLong counter = counter_li.QuadPart;
+        m_t0 = (counter * 10000 / m_frequency) - t*10;
+    }
+#else
     m_t0 = wxGetLocalTimeMillis() - t;
+#endif
     m_pause = 0;
     m_pauseCount = 0;
 }
 
 long wxStopWatch::GetElapsedTime() const
 {
+#if 0
+//__WXMSW__
+    if (m_frequency == 0)
+    {
+        return (wxGetLocalTimeMillis() - m_t0).GetLo();
+    }
+    else
+    {
+        LARGE_INTEGER counter_li;
+        ::QueryPerformanceCounter( &counter_li );
+        wxLongLong counter = counter_li.QuadPart;
+        wxLongLong res = (counter * 10000 / m_frequency) - m_t0;
+        return res.GetLo() / 10;
+    }
+#else
     return (wxGetLocalTimeMillis() - m_t0).GetLo();
+#endif
 }
 
 long wxStopWatch::Time() const
@@ -193,12 +235,7 @@ long wxGetLocalTime()
 // 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
@@ -211,7 +248,19 @@ wxLongLong wxGetLocalTimeMillis()
     // If possible, use a function which avoids conversions from
     // broken-up time structures to milliseconds
 
-#if defined(__WXMSW__) && (defined(__WINE__) || defined(__MWERKS__))
+#if defined(__WXPALMOS__)
+    DateTimeType thenst;
+    thenst.second  = 0;
+    thenst.minute  = 0;
+    thenst.hour    = 0;
+    thenst.day     = 1;
+    thenst.month   = 1;
+    thenst.year    = 1970;
+    thenst.weekDay = 5;
+    uint32_t now = TimGetSeconds();
+    uint32_t then = TimDateTimeToSeconds (&thenst);
+    return SysTimeToMilliSecs(SysTimeInSecs(now - then));
+#elif defined(__WXMSW__) && (defined(__WINE__) || defined(__MWERKS__))
     // This should probably be the way all WXMSW compilers should do it
     // Go direct to the OS for time
 
@@ -227,7 +276,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
-    
+
 #elif defined(HAVE_GETTIMEOFDAY)
     struct timeval tp;
     if ( wxGetTimeOfDay(&tp, (struct timezone *)NULL) != -1 )
@@ -245,11 +294,11 @@ wxLongLong wxGetLocalTimeMillis()
 
     // ftime() is void and not int in some mingw32 headers, so don't
     // test the return code (well, it shouldn't fail anyhow...)
-    (void)ftime(&tp);
+    (void)::ftime(&tp);
     val *= tp.time;
     return (val + tp.millitm);
 #elif defined(__WXMAC__)
-    
+
     static UInt64 gMilliAtStart = 0;
 
     Nanoseconds upTime = AbsoluteToNanoseconds( UpTime() );
@@ -313,6 +362,11 @@ wxLongLong wxGetLocalTimeMillis()
 #endif // time functions
 }
 
-#endif // wxUSE_LONGLONG
+#else // !wxUSE_LONGLONG
 
+double wxGetLocalTimeMillis(void)
+{
+    return (double(clock()) / double(CLOCKS_PER_SEC)) * 1000.0;
+}
 
+#endif // wxUSE_LONGLONG/!wxUSE_LONGLONG