part of Ictrl -> Iscntrl change I forgot to commit (not important, anyhow)

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

diff --git a/src/common/stopwatch.cpp b/src/common/stopwatch.cpp
index f11495333211ad3a537ec6e7959e361597030993..1a6fcd064b6467cac59156d907a4004500b24b86 100644 (file)
--- a/src/common/stopwatch.cpp
+++ b/src/common/stopwatch.cpp
@@ -33,15 +33,15 @@
     #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
 
 #if defined(__WIN32__) && !defined(HAVE_FTIME) && !defined(__MWERKS__) && !defined(__WXWINCE__)
 #endif
 
 #if defined(__WIN32__) && !defined(HAVE_FTIME) && !defined(__MWERKS__) && !defined(__WXWINCE__)


@@ -250,7 +250,7 @@ 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(__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