[ 1559550 ] Fix wxVariant wxDateTime conversion from time string

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

diff --git a/src/common/stopwatch.cpp b/src/common/stopwatch.cpp
index 0739cf0f4bf2453d3d3cb456231d62176249d2e2..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
 // Purpose:     wxStopWatch and other non-GUI stuff from wx/timer.h
 // Author:
 //    Original version by Julian Smart


@@ -31,6 +31,9 @@
 #include "wx/stopwatch.h"
 
 #ifndef WX_PRECOMP
 #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/intl.h"
     #include "wx/log.h"
 #endif //WX_PRECOMP


@@ -39,10 +42,6 @@
 // System headers
 // ----------------------------------------------------------------------------
 
 // 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
 #if defined(__WIN32__) && !defined(HAVE_FTIME) && !defined(__MWERKS__) && !defined(__WXWINCE__)
     #define HAVE_FTIME
 #endif


@@ -371,5 +370,3 @@ double wxGetLocalTimeMillis(void)
 }
 
 #endif // wxUSE_LONGLONG/!wxUSE_LONGLONG
 }
 
 #endif // wxUSE_LONGLONG/!wxUSE_LONGLONG

-
-