simplifications and corrections to background drawing:
1. removed ApplyParentThemeBackground() not used any longer 2. removed ProvidesBackground() which is synonymous with !HasTransparentBackground() 3. removed a whole bunch of unused MSWXXX() methods 4. moved MSWControlColor() from wxWindow up to wxControl results: 1. the gradient is still shown properly for static/radio boxes in notebooks 2. correct background colour is used for the static boxes 3. code is shorter and better commented git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33474 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -142,29 +142,31 @@ void wxTimerScheduler::NotifyTimers()
|
||||
bool oneShot;
|
||||
volatile bool timerDeleted;
|
||||
wxTimerTick_t now = GetMillisecondsTime();
|
||||
wxTimerDesc *desc;
|
||||
|
||||
while ( m_timers && m_timers->shotTime <= now )
|
||||
for ( wxTimerDesc *desc = m_timers; desc; desc = desc->next )
|
||||
{
|
||||
desc = m_timers;
|
||||
oneShot = desc->timer->IsOneShot();
|
||||
RemoveTimer(desc);
|
||||
|
||||
timerDeleted = false;
|
||||
desc->deleteFlag = &timerDeleted;
|
||||
desc->timer->Notify();
|
||||
|
||||
if ( !timerDeleted )
|
||||
if ( desc->running && desc->shotTime <= now )
|
||||
{
|
||||
wxLogTrace( wxT("timer"),
|
||||
wxT("notified timer %p sheduled for %")
|
||||
wxTimerTickFmtSpec,
|
||||
desc->timer,
|
||||
wxTimerTickPrintfArg(desc->shotTime) );
|
||||
desc = m_timers;
|
||||
oneShot = desc->timer->IsOneShot();
|
||||
RemoveTimer(desc);
|
||||
|
||||
desc->deleteFlag = NULL;
|
||||
if ( !oneShot )
|
||||
QueueTimer(desc, now + desc->timer->GetInterval());
|
||||
timerDeleted = false;
|
||||
desc->deleteFlag = &timerDeleted;
|
||||
desc->timer->Notify();
|
||||
|
||||
if ( !timerDeleted )
|
||||
{
|
||||
wxLogTrace( wxT("timer"),
|
||||
wxT("notified timer %p sheduled for %")
|
||||
wxTimerTickFmtSpec,
|
||||
desc->timer,
|
||||
wxTimerTickPrintfArg(desc->shotTime) );
|
||||
|
||||
desc->deleteFlag = NULL;
|
||||
if ( !oneShot )
|
||||
QueueTimer(desc, now + desc->timer->GetInterval());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user