added base array of size_t as under Win64 size_t > long

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

diff --git a/src/common/stopwatch.cpp b/src/common/stopwatch.cpp
index d22e49184c6cb8352e0b874521bde92e53507008..1a6fcd064b6467cac59156d907a4004500b24b86 100644 (file)
--- a/src/common/stopwatch.cpp
+++ b/src/common/stopwatch.cpp
@@ -29,20 +29,22 @@
 #endif
 
 #ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
 #endif //WX_PRECOMP
 
-#include "wx/timer.h"
 #include "wx/longlong.h"
+#include "wx/stopwatch.h"
 
 // ----------------------------------------------------------------------------
 // System headers
 // ----------------------------------------------------------------------------
 
 #if defined(__WIN32__)
-    #include <windows.h>
+    #include "wx/msw/wrapwin.h"
 #endif
 
-#if defined(__WIN32__) && !defined(HAVE_FTIME) && !defined(__MWERKS__)
+#if defined(__WIN32__) && !defined(HAVE_FTIME) && !defined(__MWERKS__) && !defined(__WXWINCE__)
     #define HAVE_FTIME
 #endif
 
@@ -58,8 +60,14 @@
 #   undef HAVE_GETTIMEOFDAY
 #endif
 
+#ifndef __WXWINCE__
 #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
 
@@ -242,7 +250,7 @@ wxLongLong wxGetLocalTimeMillis()
     // If possible, use a function which avoids conversions from
     // broken-up time structures to milliseconds
 
-#if defined(__WXMSW__) && defined(__MWERKS__)
+#if 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
 
@@ -311,11 +319,16 @@ wxLongLong wxGetLocalTimeMillis()
     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>
+
+    // FIXME
+#ifndef __WXWINCE__
     #warning "Possible clock skew bug in wxGetLocalTimeMillis()!"
+#endif
 
     SYSTEMTIME st;
     ::GetLocalTime(&st);