X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9e3cb9eefcb4e8d2d1fb45ad028468547ecc6ad9..aba4387c4c71fb812c6a07a7abb495606c5ef4af:/src/common/timercmn.cpp diff --git a/src/common/timercmn.cpp b/src/common/timercmn.cpp index ae3453a6f1..234ea9e0c2 100644 --- a/src/common/timercmn.cpp +++ b/src/common/timercmn.cpp @@ -76,7 +76,7 @@ // wxWin macros // ---------------------------------------------------------------------------- -#if wxUSE_GUI +#if wxUSE_GUI && wxUSE_TIMER IMPLEMENT_DYNAMIC_CLASS(wxTimerEvent, wxEvent) #endif // wxUSE_GUI @@ -103,7 +103,7 @@ // wxTimerBase // ---------------------------------------------------------------------------- -#if wxUSE_GUI +#if wxUSE_GUI && wxUSE_TIMER void wxTimerBase::Notify() { @@ -141,6 +141,8 @@ bool wxTimerBase::Start(int milliseconds, bool oneShot) // wxStopWatch // ---------------------------------------------------------------------------- +#if wxUSE_LONGLONG + void wxStopWatch::Start(long t) { m_t0 = wxGetLocalTimeMillis() - t; @@ -157,10 +159,14 @@ long wxStopWatch::Time() const return (m_pause ? m_pause : GetElapsedTime()); } +#endif // wxUSE_LONGLONG + // ---------------------------------------------------------------------------- // old timer functions superceded by wxStopWatch // ---------------------------------------------------------------------------- +#if wxUSE_LONGLONG + static wxLongLong wxStartTime = 0l; // starts the global timer @@ -181,6 +187,7 @@ long wxGetElapsedTime(bool resetTimer) return (newTime - oldTime).GetLo(); } +#endif // wxUSE_LONGLONG // ---------------------------------------------------------------------------- // the functions to get the current time and timezone info @@ -221,7 +228,7 @@ long wxGetLocalTime() long wxGetUTCTime() { struct tm tm; - struct tm *ptm; + struct tm *ptm; time_t t0, t1; // This cannot be made static because mktime can overwrite it @@ -267,6 +274,7 @@ long wxGetUTCTime() return -1; } +#if wxUSE_LONGLONG // Get local time as milliseconds since 00:00:00, Jan 1st 1970 wxLongLong wxGetLocalTimeMillis() @@ -335,3 +343,6 @@ wxLongLong wxGetLocalTimeMillis() #endif // time functions } + +#endif // wxUSE_LONGLONG +