wxBase compilation fixes

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

diff --git a/include/wx/stopwatch.h b/include/wx/stopwatch.h
index 55f7027b52fe76abaca92232b0e9c8728bfbfaef..22d14efec099dc68e3f73e84195fa0a9722e6e0b 100644 (file)
--- a/include/wx/stopwatch.h
+++ b/include/wx/stopwatch.h
@@ -10,7 +10,9 @@
 
 #ifndef _WX_STOPWATCH_H_
 #define _WX_STOPWATCH_H_
-//
+
+#include "wx/longlong.h"
+
 // ----------------------------------------------------------------------------
 // wxStopWatch: measure time intervals with up to 1ms resolution
 // ----------------------------------------------------------------------------

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index 6e41b0e4c31b391baae2c93427cccaba073acf1b..603736e1a24f551ee2d8c9d61d5b56e33680c7df 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/timer.h"
+#include "wx/stopwatch.h"
 #include "wx/utils.h"
 #include "wx/module.h"
 #include "wx/log.h"

diff --git a/src/common/stopwatch.cpp b/src/common/stopwatch.cpp
index f6f5638032b4e0ce8df0911bd8804c8671088c5d..d0cd68798c9b32ffc148ad2326a436bd14480a5b 100644 (file)
--- a/src/common/stopwatch.cpp
+++ b/src/common/stopwatch.cpp
@@ -33,8 +33,8 @@
     #include "wx/log.h"
 #endif //WX_PRECOMP
 
-#include "wx/timer.h"
 #include "wx/longlong.h"
+#include "wx/stopwatch.h"
 
 // ----------------------------------------------------------------------------
 // System headers

diff --git a/src/unix/threadpsx.cpp b/src/unix/threadpsx.cpp
index ac55f84a1fb097074b70b04049c55a606ce8c555..ebb4af682f61e02cbdeddeff901f4550cae3fa9c 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/timer.h"
+#include "wx/stopwatch.h"
 
 #include <stdio.h>
 #include <unistd.h>