fixes for new lib dirs for wxMSW

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

diff --git a/src/common/stopwatch.cpp b/src/common/stopwatch.cpp
index 21cd1616796a37d5bf854bd05e9b365f000718c5..d0cd68798c9b32ffc148ad2326a436bd14480a5b 100644 (file)
--- a/src/common/stopwatch.cpp
+++ b/src/common/stopwatch.cpp
@@ -33,18 +33,18 @@
     #include "wx/log.h"
 #endif //WX_PRECOMP
 
     #include "wx/log.h"
 #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
 


@@ -60,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
 


@@ -313,11 +319,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);