Include wx/stopwatch.h according to precompiled headers of wx/wx.h (with other minor cleaning).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40313 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/wx.h

@@ -28,6 +28,7 @@
 #include "wx/stream.h"
 #include "wx/memory.h"
 #include "wx/math.h"
+#include "wx/stopwatch.h"
 
 #if wxUSE_GUI
 

src/common/datetime.cpp

@@ -69,6 +69,7 @@
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/intl.h"
+    #include "wx/stopwatch.h"           // for wxGetLocalTimeMillis()
 #endif // WX_PRECOMP
 
 #include "wx/thread.h"
@@ -86,7 +87,6 @@
 #endif
 
 #include "wx/datetime.h"
-#include "wx/stopwatch.h"           // for wxGetLocalTimeMillis()
 
 const long wxDateTime::TIME_T_FACTOR = 1000l;
 

src/common/event.cpp

@@ -30,6 +30,7 @@
     #include "wx/list.h"
     #include "wx/app.h"
     #include "wx/utils.h"
+    #include "wx/stopwatch.h"
 
     #if wxUSE_GUI
         #include "wx/control.h"
@@ -41,10 +42,6 @@
 
 #include "wx/module.h"
 
-#if wxUSE_GUI && wxUSE_STOPWATCH
-    #include "wx/stopwatch.h"
-#endif // wxUSE_GUI && wxUSE_STOPWATCH
-
 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------

src/common/stopwatch.cpp

@@ -28,14 +28,13 @@
     #pragma hdrstop
 #endif
 
+#include "wx/stopwatch.h"
+
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
 #endif //WX_PRECOMP
 
-#include "wx/longlong.h"
-#include "wx/stopwatch.h"
-
 // ----------------------------------------------------------------------------
 // System headers
 // ----------------------------------------------------------------------------

src/msw/mediactrl_am.cpp

@@ -65,11 +65,11 @@
     #include "wx/dcclient.h"
     #include "wx/timer.h"
     #include "wx/math.h"        // log10 & pow
+    #include "wx/stopwatch.h"
 #endif
 
 #include "wx/msw/private.h" // user info and wndproc setting/getting
 #include "wx/dynlib.h"
-#include "wx/stopwatch.h"
 
 //---------------------------------------------------------------------------
 //  wxActiveXContainer - includes all the COM-specific stuff we need

src/unix/threadpsx.cpp

@@ -34,10 +34,10 @@
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/timer.h"
+    #include "wx/stopwatch.h"
 #endif
 
 #include "wx/module.h"
-#include "wx/stopwatch.h"
 
 #include <stdio.h>
 #include <unistd.h>