AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed bad overflow bug in wxX11 timer

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19618 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2003-03-19 16:57:30 +00:00
parent 92ee0ef908
commit 9750481f36
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/generic/timer.cpp
View File

@ -41,12 +41,13 @@
// if we are unlucky and the latter combines information from two sources.
#include "wx/mgl/private.h"
extern "C" ulong _EVT_getTicks();
#define GetMillisecondsTime() _EVT_getTicks()
#define GetMillisecondsTime _EVT_getTicks
typedef ulong wxTimerTick_t;
#else
// #define GetMillisecondsTime() wxGetLocalTimeMillis().ToLong()
// Suppresses the debug warning in ToLong. FIXME: check
// that we don't drastically lose precision
#define GetMillisecondsTime() (unsigned long) wxGetLocalTimeMillis().GetValue()
#define GetMillisecondsTime wxGetLocalTimeMillis
typedef wxLongLong wxTimerTick_t;
#endif
// ----------------------------------------------------------------------------
@ -72,7 +73,7 @@ class wxTimerScheduler
public:
wxTimerScheduler() : m_timers(NULL) {}
void QueueTimer(wxTimerDesc *desc, unsigned long when = 0);
void QueueTimer(wxTimerDesc *desc, wxTimerTick_t when = 0);
void RemoveTimer(wxTimerDesc *desc);
void NotifyTimers();
@ -80,7 +81,7 @@ private:
wxTimerDesc *m_timers;
};
void wxTimerScheduler::QueueTimer(wxTimerDesc *desc, unsigned long when)
void wxTimerScheduler::QueueTimer(wxTimerDesc *desc, wxTimerTick_t when)
{
if ( desc->running )
return; // already scheduled
@ -128,7 +129,7 @@ void wxTimerScheduler::NotifyTimers()
{
bool oneShot;
volatile bool timerDeleted;
unsigned long now = GetMillisecondsTime();
wxTimerTick_t now = GetMillisecondsTime();
wxTimerDesc *desc;
while ( m_timers && m_timers->shotTime <= now )