reverted previous commit; include wx/timer.h in wxBase instead

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

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index 603736e1a24f551ee2d8c9d61d5b56e33680c7df..6e41b0e4c31b391baae2c93427cccaba073acf1b 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -31,7 +31,7 @@
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"

-#include "wx/stopwatch.h"
+#include "wx/timer.h"

 #include "wx/utils.h"
 #include "wx/module.h"
 #include "wx/log.h"
 #include "wx/utils.h"
 #include "wx/module.h"
 #include "wx/log.h"

diff --git a/src/unix/threadpsx.cpp b/src/unix/threadpsx.cpp
index ebb4af682f61e02cbdeddeff901f4550cae3fa9c..ac55f84a1fb097074b70b04049c55a606ce8c555 100644 (file)
--- a/src/unix/threadpsx.cpp
+++ b/src/unix/threadpsx.cpp
@@ -36,7 +36,7 @@
 #include "wx/log.h"
 #include "wx/intl.h"
 #include "wx/dynarray.h"
 #include "wx/log.h"
 #include "wx/intl.h"
 #include "wx/dynarray.h"

-#include "wx/stopwatch.h"
+#include "wx/timer.h"

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