window flags extensions, streaming callback

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

diff --git a/src/generic/timer.cpp b/src/generic/timer.cpp
index f38b03600e21fe53883435e96077bbfa8a3358a7..a4afe39e25d30d060b57a63fd464a518363480df 100644 (file)
--- a/src/generic/timer.cpp
+++ b/src/generic/timer.cpp
@@ -7,7 +7,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "timer.h"
 #endif
 
 #pragma implementation "timer.h"
 #endif
 


@@ -91,9 +91,11 @@ void wxTimerScheduler::QueueTimer(wxTimerDesc *desc, wxTimerTick_t when)
     desc->shotTime = when;
     desc->running = TRUE;
 
     desc->shotTime = when;
     desc->running = TRUE;
 

+#ifndef __WXMGL__

     wxLogTrace( wxT("timer"),
                 wxT("queued timer %p at tick %") wxLongLongFmtSpec _T("d"), 
                desc->timer,  when.GetValue());
     wxLogTrace( wxT("timer"),
                 wxT("queued timer %p at tick %") wxLongLongFmtSpec _T("d"), 
                desc->timer,  when.GetValue());

+#endif

 
     if ( m_timers )
     {
 
     if ( m_timers )
     {


@@ -145,9 +147,11 @@ void wxTimerScheduler::NotifyTimers()
             
             if ( !timerDeleted )
             {
             
             if ( !timerDeleted )
             {

+#ifndef __WXMGL__

                 wxLogTrace( wxT("timer"),
                             wxT("notified timer %p sheduled for %") wxLongLongFmtSpec _T("d"), 
                             desc->timer, desc->shotTime.GetValue() );
                 wxLogTrace( wxT("timer"),
                             wxT("notified timer %p sheduled for %") wxLongLongFmtSpec _T("d"), 
                             desc->timer, desc->shotTime.GetValue() );

+#endif

 
                 desc->deleteFlag = NULL;
                 if ( !oneShot )
 
                 desc->deleteFlag = NULL;
                 if ( !oneShot )