glcanvas fix and toplevel event handler exposed

[wxWidgets.git] / include / wx / stopwatch.h

diff --git a/include/wx/stopwatch.h b/include/wx/stopwatch.h
index 52773f969de7b177f6a67e990ab0e528c9690595..22d14efec099dc68e3f73e84195fa0a9722e6e0b 100644 (file)
--- a/include/wx/stopwatch.h
+++ b/include/wx/stopwatch.h
@@ -10,14 +10,16 @@
 
 #ifndef _WX_STOPWATCH_H_
 #define _WX_STOPWATCH_H_
-//
+
+#include "wx/longlong.h"
+
 // ----------------------------------------------------------------------------
 // wxStopWatch: measure time intervals with up to 1ms resolution
 // ----------------------------------------------------------------------------
 
 #if wxUSE_STOPWATCH
 
-class WXDLLEXPORT wxStopWatch
+class WXDLLIMPEXP_BASE wxStopWatch
 {
 public:
     // ctor starts the stop watch
@@ -67,11 +69,11 @@ private:
 
 // Starts a global timer
 // -- DEPRECATED: use wxStopWatch instead
-void WXDLLEXPORT wxStartTimer();
+void WXDLLIMPEXP_BASE wxStartTimer();
 
 // Gets elapsed milliseconds since last wxStartTimer or wxGetElapsedTime
 // -- DEPRECATED: use wxStopWatch instead
-long WXDLLEXPORT wxGetElapsedTime(bool resetTimer = TRUE);
+long WXDLLIMPEXP_BASE wxGetElapsedTime(bool resetTimer = TRUE);
 
 #endif // wxUSE_LONGLONG
 
@@ -80,14 +82,14 @@ long WXDLLEXPORT wxGetElapsedTime(bool resetTimer = TRUE);
 // ----------------------------------------------------------------------------
 
 // Get number of seconds since local time 00:00:00 Jan 1st 1970.
-extern long WXDLLEXPORT wxGetLocalTime();
+extern long WXDLLIMPEXP_BASE wxGetLocalTime();
 
 // Get number of seconds since GMT 00:00:00, Jan 1st 1970.
-extern long WXDLLEXPORT wxGetUTCTime();
+extern long WXDLLIMPEXP_BASE wxGetUTCTime();
 
 #if wxUSE_LONGLONG
 // Get number of milliseconds since local time 00:00:00 Jan 1st 1970
-extern wxLongLong WXDLLEXPORT wxGetLocalTimeMillis();
+extern wxLongLong WXDLLIMPEXP_BASE wxGetLocalTimeMillis();
 #endif // wxUSE_LONGLONG
 
 #define wxGetCurrentTime() wxGetLocalTime()