X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ee9768c9e0a3ec35452e8f153dcacec423d6a358..a63d48fa138e9eaa3079172ace9a804ba5b0415e:/src/generic/timer.cpp

diff --git a/src/generic/timer.cpp b/src/generic/timer.cpp
index f38b03600e..2f0df9a975 100644
--- a/src/generic/timer.cpp
+++ b/src/generic/timer.cpp
@@ -7,7 +7,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "timer.h"
 #endif
 
@@ -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
@@ -92,8 +103,8 @@ void wxTimerScheduler::QueueTimer(wxTimerDesc *desc, wxTimerTick_t when)
     desc->running = TRUE;
 
     wxLogTrace( wxT("timer"),
-                wxT("queued timer %p at tick %") wxLongLongFmtSpec _T("d"), 
-               desc->timer,  when.GetValue());
+                wxT("queued timer %p at tick %") wxTimerTickFmtSpec, 
+               desc->timer,  wxTimerTickPrintfArg(when));
 
     if ( m_timers )
     {
@@ -146,8 +157,10 @@ void wxTimerScheduler::NotifyTimers()
             if ( !timerDeleted )
             {
                 wxLogTrace( wxT("timer"),
-                            wxT("notified timer %p sheduled for %") wxLongLongFmtSpec _T("d"), 
-                            desc->timer, desc->shotTime.GetValue() );
+                            wxT("notified timer %p sheduled for %")
+                            wxTimerTickFmtSpec, 
+                            desc->timer,
+                            wxTimerTickPrintfArg(desc->shotTime) );
 
                 desc->deleteFlag = NULL;
                 if ( !oneShot )