set selection before setting focus to the control in SetFocusFromKbd() (patch 726361)

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

diff --git a/src/generic/timer.cpp b/src/generic/timer.cpp
index 640ddfe53d1c2baeb773cecdb851f7f1a4ddf5ef..46fbe6a0c38598f7e7b2b8fc23e399f28f9ae31a 100644 (file)
--- a/src/generic/timer.cpp
+++ b/src/generic/timer.cpp
@@ -64,7 +64,7 @@ public:
     wxTimer         *timer;
     bool             running;
     wxTimerDesc     *next, *prev;
-    unsigned long    shotTime;  
+    wxTimerTick_t    shotTime;  
     volatile bool   *deleteFlag; // see comment in ~wxTimer
 };
 
@@ -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,8 +147,11 @@ void wxTimerScheduler::NotifyTimers()
             
             if ( !timerDeleted )
             {
-                wxLogTrace( wxT("timer"), wxT("notified timer %p sheduled for %ld"), 
-                           desc->timer, (long) desc->shotTime);
+#ifndef __WXMGL__
+                wxLogTrace( wxT("timer"),
+                            wxT("notified timer %p sheduled for %") wxLongLongFmtSpec _T("d"), 
+                            desc->timer, desc->shotTime.GetValue() );
+#endif
 
                 desc->deleteFlag = NULL;
                 if ( !oneShot )