Added yet another couple of missing includes (leading to linker errors).

[wxWidgets.git] / src / generic / timer.cpp

diff --git a/src/generic/timer.cpp b/src/generic/timer.cpp
index 39974a6b8e361efac41926879df2acce05aea7cb..c46854c9e92608fd63e4ea49ef60dc3fe7102114 100644 (file)
--- a/src/generic/timer.cpp
+++ b/src/generic/timer.cpp
@@ -43,7 +43,10 @@
     extern "C" ulong _EVT_getTicks();
     #define GetMillisecondsTime() _EVT_getTicks()
 #else
-    #define GetMillisecondsTime() wxGetLocalTimeMillis().ToLong()
+//    #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()
 #endif
 
 // ----------------------------------------------------------------------------
@@ -87,8 +90,8 @@ void wxTimerScheduler::QueueTimer(wxTimerDesc *desc, unsigned long when)
     desc->shotTime = when;
     desc->running = TRUE;
 
-    wxLogTrace("timer", "queued timer %p at tick %i", 
-               desc->timer, when);
+    wxLogTrace("timer", "queued timer %p at tick %ld", 
+               desc->timer, (long) when);
 
     if ( m_timers )
     {
@@ -140,8 +143,8 @@ void wxTimerScheduler::NotifyTimers()
             
             if ( !timerDeleted )
             {
-                wxLogTrace("timer", "notified timer %p sheduled for %i", 
-                           desc->timer, desc->shotTime);
+                wxLogTrace("timer", "notified timer %p sheduled for %ld", 
+                           desc->timer, (long) desc->shotTime);
 
                 desc->deleteFlag = NULL;
                 if ( !oneShot )