X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/886dd7d28e50c003cc88b81b968d487a3c17b0d7..c8e1af672f46e93ae2fe6d7f9d5b35a3d8d49c16:/include/wx/stopwatch.h diff --git a/include/wx/stopwatch.h b/include/wx/stopwatch.h index 9a014c5cd8..08c8421ccc 100644 --- a/include/wx/stopwatch.h +++ b/include/wx/stopwatch.h @@ -4,20 +4,22 @@ // 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 wxWidgets team // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #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_BASE 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_BASE wxStartTimer(); +void WXDLLIMPEXP_BASE wxStartTimer(); // Gets elapsed milliseconds since last wxStartTimer or wxGetElapsedTime // -- DEPRECATED: use wxStopWatch instead -long WXDLLEXPORT_BASE wxGetElapsedTime(bool resetTimer = TRUE); +long WXDLLIMPEXP_BASE wxGetElapsedTime(bool resetTimer = true); #endif // wxUSE_LONGLONG @@ -80,14 +82,14 @@ long WXDLLEXPORT_BASE wxGetElapsedTime(bool resetTimer = TRUE); // ---------------------------------------------------------------------------- // Get number of seconds since local time 00:00:00 Jan 1st 1970. -extern long WXDLLEXPORT_BASE wxGetLocalTime(); +extern long WXDLLIMPEXP_BASE wxGetLocalTime(); // Get number of seconds since GMT 00:00:00, Jan 1st 1970. -extern long WXDLLEXPORT_BASE 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_BASE wxGetLocalTimeMillis(); +extern wxLongLong WXDLLIMPEXP_BASE wxGetLocalTimeMillis(); #endif // wxUSE_LONGLONG #define wxGetCurrentTime() wxGetLocalTime()