X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..cf9d0f93011fc1dd1dbcb97860f0d735b2295e75:/src/generic/timer.cpp

diff --git a/src/generic/timer.cpp b/src/generic/timer.cpp
index a4afe39e25..24d5888cdd 100644
--- a/src/generic/timer.cpp
+++ b/src/generic/timer.cpp
@@ -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().
 // ----------------------------------------------------------------------------
 
@@ -44,11 +44,22 @@
     #define GetMillisecondsTime _EVT_getTicks
 
     typedef ulong wxTimerTick_t;
-#else
+
+    #define wxTimerTickFmtSpec _T("lu")
+    #define wxTimerTickPrintfArg(tt) (tt)
+#else // !__WXMGL__
     #define GetMillisecondsTime wxGetLocalTimeMillis
 
     typedef wxLongLong wxTimerTick_t;
-#endif
+
+    #if wxUSE_LONGLONG_WX
+        #define wxTimerTickFmtSpec wxLongLongFmtSpec _T("d")
+        #define wxTimerTickPrintfArg(tt) (tt.GetValue())
+    #else // using native wxLongLong
+        #define wxTimerTickFmtSpec _T("s")
+        #define wxTimerTickPrintfArg(tt) (tt.ToString().c_str())
+    #endif // wx/native long long
+#endif // __WXMGL__/!__WXMGL__
 
 // ----------------------------------------------------------------------------
 // helper structures and wxTimerScheduler
@@ -57,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
 };
 
@@ -76,7 +87,7 @@ public:
     void QueueTimer(wxTimerDesc *desc, wxTimerTick_t when = 0);
     void RemoveTimer(wxTimerDesc *desc);
     void NotifyTimers();
-   
+
 private:
     wxTimerDesc *m_timers;
 };
@@ -85,17 +96,15 @@ 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;
 
-#ifndef __WXMGL__
     wxLogTrace( wxT("timer"),
-                wxT("queued timer %p at tick %") wxLongLongFmtSpec _T("d"), 
-               desc->timer,  when.GetValue());
-#endif
+                wxT("queued timer %p at tick %") wxTimerTickFmtSpec,
+               desc->timer,  wxTimerTickPrintfArg(when));
 
     if ( m_timers )
     {
@@ -116,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 )
@@ -141,17 +150,17 @@ void wxTimerScheduler::NotifyTimers()
             oneShot = desc->timer->IsOneShot();
             RemoveTimer(desc);
 
-            timerDeleted = FALSE;
+            timerDeleted = false;
             desc->deleteFlag = &timerDeleted;
             desc->timer->Notify();
-            
+
             if ( !timerDeleted )
             {
-#ifndef __WXMGL__
                 wxLogTrace( wxT("timer"),
-                            wxT("notified timer %p sheduled for %") wxLongLongFmtSpec _T("d"), 
-                            desc->timer, desc->shotTime.GetValue() );
-#endif
+                            wxT("notified timer %p sheduled for %")
+                            wxTimerTickFmtSpec,
+                            desc->timer,
+                            wxTimerTickPrintfArg(desc->shotTime) );
 
                 desc->deleteFlag = NULL;
                 if ( !oneShot )
@@ -166,7 +175,7 @@ void wxTimerScheduler::NotifyTimers()
 // wxTimer
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxTimer,wxObject)
+IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
 
 wxTimerScheduler *gs_scheduler = NULL;
 
@@ -184,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);
@@ -201,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);
 }
 
@@ -232,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; }
 };