Warning fix for wxOS2 night build.

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

diff --git a/include/wx/stopwatch.h b/include/wx/stopwatch.h
index 22d14efec099dc68e3f73e84195fa0a9722e6e0b..75f789592b1860440847f955c52756c1b8a94f8b 100644 (file)
--- a/include/wx/stopwatch.h
+++ b/include/wx/stopwatch.h
@@ -4,13 +4,14 @@
 // Author:      Julian Smart (wxTimer), Sylvain Bougnoux (wxStopWatch)
 // Created:     26.06.03 (extracted from wx/timer.h)
 // RCS-ID:      $Id$
-// Copyright:   (c) 1998-2003 wxWindows team
+// Copyright:   (c) 1998-2003 Julian Smart, Sylvain Bougnoux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STOPWATCH_H_
 #define _WX_STOPWATCH_H_
 
+#include "wx/defs.h"
 #include "wx/longlong.h"
 
 // ----------------------------------------------------------------------------
@@ -73,7 +74,7 @@ void WXDLLIMPEXP_BASE wxStartTimer();
 
 // Gets elapsed milliseconds since last wxStartTimer or wxGetElapsedTime
 // -- DEPRECATED: use wxStopWatch instead
-long WXDLLIMPEXP_BASE wxGetElapsedTime(bool resetTimer = TRUE);
+long WXDLLIMPEXP_BASE wxGetElapsedTime(bool resetTimer = true);
 
 #endif // wxUSE_LONGLONG
 
@@ -88,10 +89,14 @@ extern long WXDLLIMPEXP_BASE wxGetLocalTime();
 extern long WXDLLIMPEXP_BASE wxGetUTCTime();
 
 #if wxUSE_LONGLONG
-// Get number of milliseconds since local time 00:00:00 Jan 1st 1970
-extern wxLongLong WXDLLIMPEXP_BASE wxGetLocalTimeMillis();
+    typedef wxLongLong wxMilliClock_t;
+#else
+    typedef double wxMilliClock_t;
 #endif // wxUSE_LONGLONG
 
+// Get number of milliseconds since local time 00:00:00 Jan 1st 1970
+extern wxMilliClock_t WXDLLIMPEXP_BASE wxGetLocalTimeMillis();
+
 #define wxGetCurrentTime() wxGetLocalTime()
 
 #endif // _WX_STOPWATCH_H_