Fix CYGWIN socket compilo

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

diff --git a/src/generic/timer.cpp b/src/generic/timer.cpp
index b2a1e92e016a38fe96994d4cf4a355fb13eeddb0..b8e4c1e1c7c6d198d5ef757642947ce3ed78bea7 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
 


@@ -19,8 +19,8 @@
 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------

-// NB: when using generic wxTimer implementation in your port, you *must* call 
-//     wxTimer::NotifyTimers() often enough. The ideal place for this 
+// NB: when using generic wxTimer implementation in your port, you *must* call
+//     wxTimer::NotifyTimers() often enough. The ideal place for this

 //     is in wxEventLoop::Dispatch().
 // ----------------------------------------------------------------------------
 
 //     is in wxEventLoop::Dispatch().
 // ----------------------------------------------------------------------------
 


@@ -44,11 +44,22 @@
     #define GetMillisecondsTime _EVT_getTicks
 
     typedef ulong wxTimerTick_t;
     #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;
     #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
 
 // ----------------------------------------------------------------------------
 // helper structures and wxTimerScheduler


@@ -57,14 +68,14 @@
 class wxTimerDesc
 {
 public:
 class wxTimerDesc
 {
 public:

-    wxTimerDesc(wxTimer *t) : 
-        timer(t), running(FALSE), next(NULL), prev(NULL), 
+    wxTimerDesc(wxTimer *t) :
+        timer(t), running(false), next(NULL), prev(NULL),

         shotTime(0), deleteFlag(NULL) {}
 
     wxTimer         *timer;
     bool             running;
     wxTimerDesc     *next, *prev;
         shotTime(0), deleteFlag(NULL) {}
 
     wxTimer         *timer;
     bool             running;
     wxTimerDesc     *next, *prev;

-    wxTimerTick_t    shotTime;  
+    wxTimerTick_t    shotTime;

     volatile bool   *deleteFlag; // see comment in ~wxTimer
 };
 
     volatile bool   *deleteFlag; // see comment in ~wxTimer
 };
 


@@ -76,7 +87,7 @@ public:
     void QueueTimer(wxTimerDesc *desc, wxTimerTick_t when = 0);
     void RemoveTimer(wxTimerDesc *desc);
     void NotifyTimers();
     void QueueTimer(wxTimerDesc *desc, wxTimerTick_t when = 0);
     void RemoveTimer(wxTimerDesc *desc);
     void NotifyTimers();

-   
+

 private:
     wxTimerDesc *m_timers;
 };
 private:
     wxTimerDesc *m_timers;
 };


@@ -85,14 +96,15 @@ void wxTimerScheduler::QueueTimer(wxTimerDesc *desc, wxTimerTick_t when)
 {
     if ( desc->running )
         return; // already scheduled
 {
     if ( desc->running )
         return; // already scheduled

-        
+

     if ( when == 0 )
         when = GetMillisecondsTime() + desc->timer->GetInterval();
     desc->shotTime = when;
     if ( when == 0 )
         when = GetMillisecondsTime() + desc->timer->GetInterval();
     desc->shotTime = when;

-    desc->running = TRUE;
+    desc->running = true;

 
 

-    wxLogTrace( wxT("timer"), wxT("queued timer %p at tick %ld"), 
-               desc->timer, (long) when);
+    wxLogTrace( wxT("timer"),
+                wxT("queued timer %p at tick %") wxTimerTickFmtSpec,
+               desc->timer,  wxTimerTickPrintfArg(when));

 
     if ( m_timers )
     {
 
     if ( m_timers )
     {


@@ -113,7 +125,7 @@ void wxTimerScheduler::QueueTimer(wxTimerDesc *desc, wxTimerTick_t when)
 
 void wxTimerScheduler::RemoveTimer(wxTimerDesc *desc)
 {
 
 void wxTimerScheduler::RemoveTimer(wxTimerDesc *desc)
 {

-    desc->running = FALSE;
+    desc->running = false;

     if ( desc == m_timers )
         m_timers = desc->next;
     if ( desc->prev )
     if ( desc == m_timers )
         m_timers = desc->next;
     if ( desc->prev )


@@ -130,27 +142,31 @@ void wxTimerScheduler::NotifyTimers()
         bool oneShot;
         volatile bool timerDeleted;
         wxTimerTick_t now = GetMillisecondsTime();
         bool oneShot;
         volatile bool timerDeleted;
         wxTimerTick_t now = GetMillisecondsTime();

-        wxTimerDesc *desc;

 
 

-        while ( m_timers && m_timers->shotTime <= now )
+        for ( wxTimerDesc *desc = m_timers; desc; desc = desc->next )

         {
         {

-            desc = m_timers;
-            oneShot = desc->timer->IsOneShot();
-            RemoveTimer(desc);
-
-            timerDeleted = FALSE;
-            desc->deleteFlag = &timerDeleted;
-            desc->timer->Notify();
-            
-            if ( !timerDeleted )
+            if ( desc->running && desc->shotTime <= now )

             {
             {

-                wxLogTrace( wxT("timer"),
-                            wxT("notified timer %p sheduled for %" wxLongLongFmtSpec), 
-                            desc->timer, desc->shotTime );
-
-                desc->deleteFlag = NULL;
-                if ( !oneShot )
-                    QueueTimer(desc, now + desc->timer->GetInterval());
+                desc = m_timers;
+                oneShot = desc->timer->IsOneShot();
+                RemoveTimer(desc);
+
+                timerDeleted = false;
+                desc->deleteFlag = &timerDeleted;
+                desc->timer->Notify();
+
+                if ( !timerDeleted )
+                {
+                    wxLogTrace( wxT("timer"),
+                                wxT("notified timer %p sheduled for %")
+                                wxTimerTickFmtSpec,
+                                desc->timer,
+                                wxTimerTickPrintfArg(desc->shotTime) );
+
+                    desc->deleteFlag = NULL;
+                    if ( !oneShot )
+                        QueueTimer(desc, now + desc->timer->GetInterval());
+                }

             }
         }
     }
             }
         }
     }


@@ -161,7 +177,7 @@ void wxTimerScheduler::NotifyTimers()
 // wxTimer
 // ----------------------------------------------------------------------------
 
 // wxTimer
 // ----------------------------------------------------------------------------
 

-IMPLEMENT_ABSTRACT_CLASS(wxTimer,wxObject)
+IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)

 
 wxTimerScheduler *gs_scheduler = NULL;
 
 
 wxTimerScheduler *gs_scheduler = NULL;
 


@@ -179,11 +195,11 @@ wxTimer::~wxTimer()
         Stop();
 
     // NB: this is a hack: wxTimerScheduler must have some way of knowing
         Stop();
 
     // NB: this is a hack: wxTimerScheduler must have some way of knowing

-    //     that wxTimer object was deleted under its hands -- this may 
+    //     that wxTimer object was deleted under its hands -- this may

     //     happen if somebody is really nasty and deletes the timer
     //     from wxTimer::Notify()
     if ( m_desc->deleteFlag != NULL )
     //     happen if somebody is really nasty and deletes the timer
     //     from wxTimer::Notify()
     if ( m_desc->deleteFlag != NULL )

-        *m_desc->deleteFlag = TRUE;
+        *m_desc->deleteFlag = true;

 
     delete m_desc;
     wxLogTrace( wxT("timer"), wxT("    ...done destroying timer %p..."), this);
 
     delete m_desc;
     wxLogTrace( wxT("timer"), wxT("    ...done destroying timer %p..."), this);


@@ -196,20 +212,20 @@ bool wxTimer::IsRunning() const
 
 bool wxTimer::Start(int millisecs, bool oneShot)
 {
 
 bool wxTimer::Start(int millisecs, bool oneShot)
 {

-    wxLogTrace( wxT("timer"), wxT("started timer %p: %i ms, oneshot=%i"), 
+    wxLogTrace( wxT("timer"), wxT("started timer %p: %i ms, oneshot=%i"),

                this, millisecs, oneShot);
 
     if ( !wxTimerBase::Start(millisecs, oneShot) )
                this, millisecs, oneShot);
 
     if ( !wxTimerBase::Start(millisecs, oneShot) )

-        return FALSE;
-    
+        return false;
+

     gs_scheduler->QueueTimer(m_desc);
     gs_scheduler->QueueTimer(m_desc);

-    return TRUE;
+    return true;

 }
 
 void wxTimer::Stop()
 {
     if ( !m_desc->running ) return;
 }
 
 void wxTimer::Stop()
 {
     if ( !m_desc->running ) return;

-    
+

     gs_scheduler->RemoveTimer(m_desc);
 }
 
     gs_scheduler->RemoveTimer(m_desc);
 }
 


@@ -227,7 +243,7 @@ class wxTimerModule: public wxModule
 DECLARE_DYNAMIC_CLASS(wxTimerModule)
 public:
     wxTimerModule() {}
 DECLARE_DYNAMIC_CLASS(wxTimerModule)
 public:
     wxTimerModule() {}

-    bool OnInit() { return TRUE; }
+    bool OnInit() { return true; }

     void OnExit() { delete gs_scheduler; gs_scheduler = NULL; }
 };
 
     void OnExit() { delete gs_scheduler; gs_scheduler = NULL; }
 };