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

merged 2.4 branch into the trunk

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-12-04 14:11:26 +00:00
parent 59a944cb63
commit 2b5f62a0b2
1057 changed files with 37805 additions and 24034 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/generic/timer.cpp
View File

@@ -90,7 +90,7 @@ void wxTimerScheduler::QueueTimer(wxTimerDesc *desc, unsigned long when)
desc->shotTime = when;
desc->running = TRUE;
wxLogTrace("timer", "queued timer %p at tick %ld",
wxLogTrace( wxT("timer"), wxT("queued timer %p at tick %ld"),
desc->timer, (long) when);
if ( m_timers )
@@ -143,7 +143,7 @@ void wxTimerScheduler::NotifyTimers()
if ( !timerDeleted )
{
wxLogTrace("timer", "notified timer %p sheduled for %ld",
wxLogTrace( wxT("timer"), wxT("notified timer %p sheduled for %ld"),
desc->timer, (long) desc->shotTime);
desc->deleteFlag = NULL;
@@ -172,7 +172,7 @@ void wxTimer::Init()
wxTimer::~wxTimer()
{
wxLogTrace("timer", "destroying timer %p...", this);
wxLogTrace( wxT("timer"), wxT("destroying timer %p..."), this);
if ( IsRunning() )
Stop();
@@ -184,7 +184,7 @@ wxTimer::~wxTimer()
*m_desc->deleteFlag = TRUE;
delete m_desc;
wxLogTrace("timer", " ...done destroying timer %p...", this);
wxLogTrace( wxT("timer"), wxT(" ...done destroying timer %p..."), this);
}
bool wxTimer::IsRunning() const
@@ -194,7 +194,7 @@ bool wxTimer::IsRunning() const
bool wxTimer::Start(int millisecs, bool oneShot)
{
wxLogTrace("timer", "started timer %p: %i ms, oneshot=%i",
wxLogTrace( wxT("timer"), wxT("started timer %p: %i ms, oneshot=%i"),
this, millisecs, oneShot);
if ( !wxTimerBase::Start(millisecs, oneShot) )