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

first pass of wxUniv merge - nothing works, most parts don't even compile

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-06-26 20:59:19 +00:00
parent aeb313f31c
commit 1e6feb95a7
409 changed files with 42065 additions and 6675 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/common/timercmn.cpp
View File

@@ -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