wxMGL compilation fixes

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

diff --git a/src/generic/timer.cpp b/src/generic/timer.cpp
index b2a1e92e016a38fe96994d4cf4a355fb13eeddb0..a4afe39e25d30d060b57a63fd464a518363480df 100644 (file)
--- 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
 
@@ -91,8 +91,11 @@ void wxTimerScheduler::QueueTimer(wxTimerDesc *desc, wxTimerTick_t when)
     desc->shotTime = when;
     desc->running = TRUE;
 
-    wxLogTrace( wxT("timer"), wxT("queued timer %p at tick %ld"), 
-               desc->timer, (long) when);
+#ifndef __WXMGL__
+    wxLogTrace( wxT("timer"),
+                wxT("queued timer %p at tick %") wxLongLongFmtSpec _T("d"), 
+               desc->timer,  when.GetValue());
+#endif
 
     if ( m_timers )
     {
@@ -144,9 +147,11 @@ void wxTimerScheduler::NotifyTimers()
             
             if ( !timerDeleted )
             {
+#ifndef __WXMGL__
                 wxLogTrace( wxT("timer"),
-                            wxT("notified timer %p sheduled for %" wxLongLongFmtSpec), 
-                            desc->timer, desc->shotTime );
+                            wxT("notified timer %p sheduled for %") wxLongLongFmtSpec _T("d"), 
+                            desc->timer, desc->shotTime.GetValue() );
+#endif
 
                 desc->deleteFlag = NULL;
                 if ( !oneShot )