Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No changes, just move time functions from wx/stopwatch.h to wx/time.h.

Browse Source 
Preserve compatibility by including wx/time.h from wx/stopwatch.h but put all
the time-related functions in a more logical place.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69838 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2011-11-27 19:50:27 +00:00
parent a43503cb8d
commit 173a5ddc77
6 changed files with 296 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
interface/wx/stopwatch.h
View File

@@ -84,59 +84,3 @@ public:
wxLongLong TimeInMicro() const;
};
// ============================================================================
// Global functions/macros
// ============================================================================
/** @addtogroup group_funcmacro_time */
//@{
/**
Returns the number of seconds since local time 00:00:00 Jan 1st 1970.
@see wxDateTime::Now()
@header{wx/stopwatch.h}
*/
long wxGetLocalTime();
/**
Returns the number of milliseconds since local time 00:00:00 Jan 1st 1970.
The use of wxGetUTCTimeMillis() is preferred as it provides a usually
(except for changes to the system time) monotonic clock which the local
time also changes whenever DST begins or ends.
@see wxDateTime::Now(), wxGetUTCTimeMillis(), wxGetUTCTimeUSec()
@header{wx/stopwatch.h}
*/
wxLongLong wxGetLocalTimeMillis();
/**
Returns the number of seconds since GMT 00:00:00 Jan 1st 1970.
@see wxDateTime::Now()
@header{wx/stopwatch.h}
*/
long wxGetUTCTime();
/**
Returns the number of milliseconds since GMT 00:00:00 Jan 1st 1970.
@since 2.9.3
*/
wxLongLong wxGetUTCTimeMillis();
/**
Returns the number of microseconds since GMT 00:00:00 Jan 1st 1970.
@since 2.9.3
*/
wxLongLong wxGetUTCTimeUSec();
//@}

49
interface/wx/time.h
View File

@@ -18,4 +18,53 @@
*/
int wxGetTimeZone();
/**
Returns the number of seconds since local time 00:00:00 Jan 1st 1970.
@see wxDateTime::Now()
@header{wx/time.h}
*/
long wxGetLocalTime();
/**
Returns the number of milliseconds since local time 00:00:00 Jan 1st 1970.
The use of wxGetUTCTimeMillis() is preferred as it provides a usually
(except for changes to the system time) monotonic clock which the local
time also changes whenever DST begins or ends.
@see wxDateTime::Now(), wxGetUTCTimeMillis(), wxGetUTCTimeUSec()
@header{wx/time.h}
*/
wxLongLong wxGetLocalTimeMillis();
/**
Returns the number of seconds since GMT 00:00:00 Jan 1st 1970.
@see wxDateTime::Now()
@header{wx/time.h}
*/
long wxGetUTCTime();
/**
Returns the number of milliseconds since GMT 00:00:00 Jan 1st 1970.
@header{wx/time.h}
@since 2.9.3
*/
wxLongLong wxGetUTCTimeMillis();
/**
Returns the number of microseconds since GMT 00:00:00 Jan 1st 1970.
@header{wx/time.h}
@since 2.9.3
*/
wxLongLong wxGetUTCTimeUSec();
//@}