fixed bad overflow bug in wxX11 timer

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19618 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/timer.cpp b/src/generic/timer.cpp
index 97ac996536e5039e8b25a21d24eb46e153f6e294..640ddfe53d1c2baeb773cecdb851f7f1a4ddf5ef 100644 (file)
--- a/src/generic/timer.cpp
+++ b/src/generic/timer.cpp
@@ -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();
     // 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
 #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
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -72,7 +73,7 @@ class wxTimerScheduler
 public:
     wxTimerScheduler() : m_timers(NULL) {}
 
 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();
    
     void RemoveTimer(wxTimerDesc *desc);
     void NotifyTimers();
    


@@ -80,7 +81,7 @@ private:
     wxTimerDesc *m_timers;
 };
 
     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
 {
     if ( desc->running )
         return; // already scheduled


@@ -128,7 +129,7 @@ void wxTimerScheduler::NotifyTimers()
     {
         bool oneShot;
         volatile bool timerDeleted;
     {
         bool oneShot;
         volatile bool timerDeleted;

-        unsigned long now = GetMillisecondsTime();
+        wxTimerTick_t now = GetMillisecondsTime();

         wxTimerDesc *desc;
 
         while ( m_timers && m_timers->shotTime <= now )
         wxTimerDesc *desc;
 
         while ( m_timers && m_timers->shotTime <= now )