move code ignoring VK_SPACE and VK_RETURN WM_CHAR messages to MSWDefWindowProc()...

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

diff --git a/src/common/stopwatch.cpp b/src/common/stopwatch.cpp
index d22e49184c6cb8352e0b874521bde92e53507008..236dc5aa67b766cc46426e54cf4a06c23d4194d3 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
 ///////////////////////////////////////////////////////////////////////////////
 


@@ -29,20 +29,22 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

+    #include "wx/intl.h"
+    #include "wx/log.h"

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

-#include "wx/timer.h"

 #include "wx/longlong.h"
 #include "wx/longlong.h"

+#include "wx/stopwatch.h"

 
 // ----------------------------------------------------------------------------
 // System headers
 // ----------------------------------------------------------------------------
 
 #if defined(__WIN32__)
 
 // ----------------------------------------------------------------------------
 // System headers
 // ----------------------------------------------------------------------------
 
 #if defined(__WIN32__)

-    #include <windows.h>
+    #include "wx/msw/wrapwin.h"

 #endif
 
 #endif
 

-#if defined(__WIN32__) && !defined(HAVE_FTIME) && !defined(__MWERKS__)
+#if defined(__WIN32__) && !defined(HAVE_FTIME) && !defined(__MWERKS__) && !defined(__WXWINCE__)

     #define HAVE_FTIME
 #endif
 
     #define HAVE_FTIME
 #endif
 


@@ -58,8 +60,14 @@
 #   undef HAVE_GETTIMEOFDAY
 #endif
 
 #   undef HAVE_GETTIMEOFDAY
 #endif
 

+#ifndef __WXWINCE__

 #include <time.h>
 #include <time.h>

-#ifndef __WXMAC__
+#else
+#include "wx/msw/private.h"
+#include "wx/msw/wince/time.h"
+#endif
+
+#if !defined(__WXMAC__) && !defined(__WXWINCE__)

     #include <sys/types.h>      // for time_t
 #endif
 
     #include <sys/types.h>      // for time_t
 #endif
 


@@ -102,14 +110,48 @@
 
 void wxStopWatch::Start(long t)
 {
 
 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;
     m_t0 = wxGetLocalTimeMillis() - t;

+#endif

     m_pause = 0;
     m_pauseCount = 0;
 }
 
 long wxStopWatch::GetElapsedTime() const
 {
     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();
     return (wxGetLocalTimeMillis() - m_t0).GetLo();

+#endif

 }
 
 long wxStopWatch::Time() const
 }
 
 long wxStopWatch::Time() const


@@ -185,51 +227,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()
 {

-    struct tm tm;
-    struct tm *ptm;
-    time_t t0, t1;
-
-    // This cannot be made static because mktime can overwrite it
-    //
-    memset(&tm, 0, sizeof(tm));
-    tm.tm_year  = 70;
-    tm.tm_mon   = 0;
-    tm.tm_mday  = 5;        // not Jan 1st 1970 due to mktime 'feature'
-    tm.tm_hour  = 0;
-    tm.tm_min   = 0;
-    tm.tm_sec   = 0;
-    tm.tm_isdst = -1;       // let mktime guess
-
-    // Note that mktime assumes that the struct tm contains local time.
-    //
-    t1 = time(&t1);         // now
-    t0 = mktime(&tm);       // origin in localtime
-
-    if (( t0 != (time_t)-1 ) && ( t1 != (time_t)-1 ))
-    {
-        // To get t0 as GMT we convert to a struct tm with gmtime,
-        // and then back again.
-        //
-        ptm = gmtime(&t0);
-
-        if (ptm)
-        {
-            memcpy(&tm, ptm, sizeof(tm));
-            t0 = mktime(&tm);
-
-            if (t0 != (time_t)-1 )
-                return (long)difftime(t1, t0) + (60 * 60 * 24 * 4);
-            wxLogSysError(_("mktime() failed"));
-        }
-        else
-        {
-            wxLogSysError(_("gmtime() failed"));
-        }
-    }
-
-    wxLogError(_("Failed to get the UTC system time."));
-
-    return -1;
+    return (long)time(NULL);

 }
 
 #if wxUSE_LONGLONG
 }
 
 #if wxUSE_LONGLONG


@@ -242,7 +240,19 @@ wxLongLong wxGetLocalTimeMillis()
     // If possible, use a function which avoids conversions from
     // broken-up time structures to milliseconds
 
     // If possible, use a function which avoids conversions from
     // broken-up time structures to milliseconds
 

-#if defined(__WXMSW__) && 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
 
     // This should probably be the way all WXMSW compilers should do it
     // Go direct to the OS for time
 


@@ -258,7 +268,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 )


@@ -280,7 +290,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() );


@@ -311,11 +321,16 @@ wxLongLong wxGetLocalTimeMillis()
     val *= wxGetLocalTime();
 
 // GRG: This will go soon as all WIN32 seem to have ftime
     val *= wxGetLocalTime();
 
 // GRG: This will go soon as all WIN32 seem to have ftime

+// JACS: unfortunately not. WinCE doesn't have it.

 #if defined (__WIN32__)
     // If your platform/compiler needs to use two different functions
     // to get ms resolution, please do NOT just shut off these warnings,
     // drop me a line instead at <guille@iies.es>
 #if defined (__WIN32__)
     // If your platform/compiler needs to use two different functions
     // to get ms resolution, please do NOT just shut off these warnings,
     // drop me a line instead at <guille@iies.es>

+
+    // FIXME
+#ifndef __WXWINCE__

     #warning "Possible clock skew bug in wxGetLocalTimeMillis()!"
     #warning "Possible clock skew bug in wxGetLocalTimeMillis()!"

+#endif

 
     SYSTEMTIME st;
     ::GetLocalTime(&st);
 
     SYSTEMTIME st;
     ::GetLocalTime(&st);