Code cleaning: wxID_ANY, wxDefaultSize, wxDefaultPosition, true, false, wxEmptyString, tabs and white spaces.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27853 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-06-17 16:22:36 +00:00
parent f938940e09
commit ca65c0440a
76 changed files with 2347 additions and 2332 deletions

View File

@@ -19,8 +19,8 @@
#endif
// ----------------------------------------------------------------------------
// NB: when using generic wxTimer implementation in your port, you *must* call
// wxTimer::NotifyTimers() often enough. The ideal place for this
// NB: when using generic wxTimer implementation in your port, you *must* call
// wxTimer::NotifyTimers() often enough. The ideal place for this
// is in wxEventLoop::Dispatch().
// ----------------------------------------------------------------------------
@@ -68,14 +68,14 @@
class wxTimerDesc
{
public:
wxTimerDesc(wxTimer *t) :
timer(t), running(FALSE), next(NULL), prev(NULL),
wxTimerDesc(wxTimer *t) :
timer(t), running(false), next(NULL), prev(NULL),
shotTime(0), deleteFlag(NULL) {}
wxTimer *timer;
bool running;
wxTimerDesc *next, *prev;
wxTimerTick_t shotTime;
wxTimerTick_t shotTime;
volatile bool *deleteFlag; // see comment in ~wxTimer
};
@@ -87,7 +87,7 @@ public:
void QueueTimer(wxTimerDesc *desc, wxTimerTick_t when = 0);
void RemoveTimer(wxTimerDesc *desc);
void NotifyTimers();
private:
wxTimerDesc *m_timers;
};
@@ -96,14 +96,14 @@ void wxTimerScheduler::QueueTimer(wxTimerDesc *desc, wxTimerTick_t when)
{
if ( desc->running )
return; // already scheduled
if ( when == 0 )
when = GetMillisecondsTime() + desc->timer->GetInterval();
desc->shotTime = when;
desc->running = TRUE;
desc->running = true;
wxLogTrace( wxT("timer"),
wxT("queued timer %p at tick %") wxTimerTickFmtSpec,
wxT("queued timer %p at tick %") wxTimerTickFmtSpec,
desc->timer, wxTimerTickPrintfArg(when));
if ( m_timers )
@@ -125,7 +125,7 @@ void wxTimerScheduler::QueueTimer(wxTimerDesc *desc, wxTimerTick_t when)
void wxTimerScheduler::RemoveTimer(wxTimerDesc *desc)
{
desc->running = FALSE;
desc->running = false;
if ( desc == m_timers )
m_timers = desc->next;
if ( desc->prev )
@@ -150,15 +150,15 @@ void wxTimerScheduler::NotifyTimers()
oneShot = desc->timer->IsOneShot();
RemoveTimer(desc);
timerDeleted = FALSE;
timerDeleted = false;
desc->deleteFlag = &timerDeleted;
desc->timer->Notify();
if ( !timerDeleted )
{
wxLogTrace( wxT("timer"),
wxT("notified timer %p sheduled for %")
wxTimerTickFmtSpec,
wxTimerTickFmtSpec,
desc->timer,
wxTimerTickPrintfArg(desc->shotTime) );
@@ -193,11 +193,11 @@ wxTimer::~wxTimer()
Stop();
// NB: this is a hack: wxTimerScheduler must have some way of knowing
// that wxTimer object was deleted under its hands -- this may
// that wxTimer object was deleted under its hands -- this may
// happen if somebody is really nasty and deletes the timer
// from wxTimer::Notify()
if ( m_desc->deleteFlag != NULL )
*m_desc->deleteFlag = TRUE;
*m_desc->deleteFlag = true;
delete m_desc;
wxLogTrace( wxT("timer"), wxT(" ...done destroying timer %p..."), this);
@@ -210,20 +210,20 @@ bool wxTimer::IsRunning() const
bool wxTimer::Start(int millisecs, bool oneShot)
{
wxLogTrace( wxT("timer"), wxT("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) )
return FALSE;
return false;
gs_scheduler->QueueTimer(m_desc);
return TRUE;
return true;
}
void wxTimer::Stop()
{
if ( !m_desc->running ) return;
gs_scheduler->RemoveTimer(m_desc);
}
@@ -241,7 +241,7 @@ class wxTimerModule: public wxModule
DECLARE_DYNAMIC_CLASS(wxTimerModule)
public:
wxTimerModule() {}
bool OnInit() { return TRUE; }
bool OnInit() { return true; }
void OnExit() { delete gs_scheduler; gs_scheduler = NULL; }
};