From 5ed08e5bb5b44917103b6264b1fbde7b4672b8d1 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 3 Oct 2003 15:08:49 +0000
Subject: [PATCH] fix wxLongLong values printinf for MGL and for
 wxUSE_LONGLONG_WX case

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24066 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/generic/timer.cpp | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/generic/timer.cpp b/src/generic/timer.cpp
index a4afe39e25..2f0df9a975 100644
--- a/src/generic/timer.cpp
+++ b/src/generic/timer.cpp
@@ -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
@@ -91,11 +102,9 @@ void wxTimerScheduler::QueueTimer(wxTimerDesc *desc, wxTimerTick_t when)
     desc->shotTime = when;
     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 )
     {
@@ -147,11 +156,11 @@ void wxTimerScheduler::NotifyTimers()
             
             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 )
-- 
2.45.2