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

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

diff --git a/include/wx/wx.h b/include/wx/wx.h
index d78b7eca02977148e9566a0e51fcfb6087266d98..bba9811acfac8c06aad636b134c76408f103d487 100644 (file)
--- a/include/wx/wx.h
+++ b/include/wx/wx.h
@@ -28,6 +28,7 @@
 #include "wx/stream.h"
 #include "wx/memory.h"
 #include "wx/math.h"
 #include "wx/stream.h"
 #include "wx/memory.h"
 #include "wx/math.h"

+#include "wx/stopwatch.h"

 
 #if wxUSE_GUI
 
 
 #if wxUSE_GUI
 

diff --git a/src/common/datetime.cpp b/src/common/datetime.cpp
index 7b85eea106982b99579e7e227744cec2582d3807..0832f5379f7cfe7859ba1e2a9d1516bbb4b6c4ef 100644 (file)
--- a/src/common/datetime.cpp
+++ b/src/common/datetime.cpp
@@ -69,6 +69,7 @@
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/intl.h"
     #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"
 #endif // WX_PRECOMP
 
 #include "wx/thread.h"


@@ -86,7 +87,6 @@
 #endif
 
 #include "wx/datetime.h"
 #endif
 
 #include "wx/datetime.h"

-#include "wx/stopwatch.h"           // for wxGetLocalTimeMillis()

 
 const long wxDateTime::TIME_T_FACTOR = 1000l;
 
 
 const long wxDateTime::TIME_T_FACTOR = 1000l;
 

diff --git a/src/common/event.cpp b/src/common/event.cpp
index f33787b099836b33c03f6254018659d59f4ea421..a22b1b0407440a9b23d2b5c1e712807b6579c3b8 100644 (file)
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -30,6 +30,7 @@
     #include "wx/list.h"
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/list.h"
     #include "wx/app.h"
     #include "wx/utils.h"

+    #include "wx/stopwatch.h"

 
     #if wxUSE_GUI
         #include "wx/control.h"
 
     #if wxUSE_GUI
         #include "wx/control.h"


@@ -41,10 +42,6 @@
 
 #include "wx/module.h"
 
 
 #include "wx/module.h"
 

-#if wxUSE_GUI && wxUSE_STOPWATCH
-    #include "wx/stopwatch.h"
-#endif // wxUSE_GUI && wxUSE_STOPWATCH
-

 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------

diff --git a/src/common/stopwatch.cpp b/src/common/stopwatch.cpp
index 9cf9902ae13209acb5170364789ce4d6602c1e7e..0739cf0f4bf2453d3d3cb456231d62176249d2e2 100644 (file)
--- a/src/common/stopwatch.cpp
+++ b/src/common/stopwatch.cpp
@@ -28,14 +28,13 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/stopwatch.h"
+

 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
 #endif //WX_PRECOMP
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
 #endif //WX_PRECOMP
 

-#include "wx/longlong.h"
-#include "wx/stopwatch.h"
-

 // ----------------------------------------------------------------------------
 // System headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // System headers
 // ----------------------------------------------------------------------------

diff --git a/src/msw/mediactrl_am.cpp b/src/msw/mediactrl_am.cpp
index cee182bf065f6c915ae00389359e476e795b9e95..eb5701a245d716f4b2a7a22ac31a615d838a96cb 100644 (file)
--- a/src/msw/mediactrl_am.cpp
+++ b/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/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"
 #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
 
 //---------------------------------------------------------------------------
 //  wxActiveXContainer - includes all the COM-specific stuff we need

diff --git a/src/unix/threadpsx.cpp b/src/unix/threadpsx.cpp
index b2f70b8bc61ba01690c1f55f853195ac9a6c23ae..1104048d4e6d09383331449c3ff80d22b691b63b 100644 (file)
--- a/src/unix/threadpsx.cpp
+++ b/src/unix/threadpsx.cpp
@@ -34,10 +34,10 @@
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/timer.h"
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/timer.h"

+    #include "wx/stopwatch.h"

 #endif
 
 #include "wx/module.h"
 #endif
 
 #include "wx/module.h"

-#include "wx/stopwatch.h"

 
 #include <stdio.h>
 #include <unistd.h>
 
 #include <stdio.h>
 #include <unistd.h>