small includes cleanup

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

diff --git a/src/generic/timer.cpp b/src/generic/timer.cpp
index b8e4c1e1c7c6d198d5ef757642947ce3ed78bea7..35dae55a81fd813e3e916e3319af67bfe6c41299 100644 (file)
--- a/src/generic/timer.cpp
+++ b/src/generic/timer.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        mgl/timer.cpp
+// Name:        src/generic/timer.cpp

 // Purpose:     wxTimer implementation
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Purpose:     wxTimer implementation
 // Author:      Vaclav Slavik
 // Id:          $Id$


@@ -7,10 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "timer.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -24,42 +20,36 @@
 //     is in wxEventLoop::Dispatch().
 // ----------------------------------------------------------------------------
 
 //     is in wxEventLoop::Dispatch().
 // ----------------------------------------------------------------------------
 

-#include "wx/timer.h"
-

 #if wxUSE_TIMER
 
 #if wxUSE_TIMER
 

-#include "wx/log.h"
-#include "wx/module.h"
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/module.h"
+#endif
+
+#include "wx/apptrait.h"
+#include "wx/generic/private/timer.h"

 
 // ----------------------------------------------------------------------------
 // Time input function
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // Time input function
 // ----------------------------------------------------------------------------
 

-#ifdef __WXMGL__
-    // We take advantage of wxMGL's _EVT_getTicks because it is faster
-    // (especially under MS-DOS!) and more precise than wxGetLocalTimeMillis
-    // if we are unlucky and the latter combines information from two sources.
-    #include "wx/mgl/private.h"
-    extern "C" ulong _EVT_getTicks();
-    #define GetMillisecondsTime _EVT_getTicks
+#define GetMillisecondsTime wxGetLocalTimeMillis

 
 

-    typedef ulong wxTimerTick_t;
+typedef wxLongLong wxTimerTick_t;

 
 

-    #define wxTimerTickFmtSpec _T("lu")
-    #define wxTimerTickPrintfArg(tt) (tt)
-#else // !__WXMGL__
-    #define GetMillisecondsTime wxGetLocalTimeMillis
+#if wxUSE_LONGLONG_WX
+    #define wxTimerTickFmtSpec wxLongLongFmtSpec "d"
+    #define wxTimerTickPrintfArg(tt) (tt.GetValue())
+#else // using native wxLongLong
+    #define wxTimerTickFmtSpec wxT("s")
+    #define wxTimerTickPrintfArg(tt) (tt.ToString().c_str())
+#endif // wx/native long long

 
 

-    typedef wxLongLong wxTimerTick_t;
-
-    #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__
+inline bool wxTickGreaterEqual(wxTimerTick_t x, wxTimerTick_t y)
+{
+    return x >= y;
+}

 
 // ----------------------------------------------------------------------------
 // helper structures and wxTimerScheduler
 
 // ----------------------------------------------------------------------------
 // helper structures and wxTimerScheduler


@@ -68,15 +58,15 @@
 class wxTimerDesc
 {
 public:
 class wxTimerDesc
 {
 public:

-    wxTimerDesc(wxTimer *t) :
+    wxTimerDesc(wxGenericTimerImpl *t) :

         timer(t), running(false), next(NULL), prev(NULL),
         shotTime(0), deleteFlag(NULL) {}
 
         timer(t), running(false), next(NULL), prev(NULL),
         shotTime(0), deleteFlag(NULL) {}
 

-    wxTimer         *timer;
-    bool             running;
-    wxTimerDesc     *next, *prev;
-    wxTimerTick_t    shotTime;
-    volatile bool   *deleteFlag; // see comment in ~wxTimer
+    wxGenericTimerImpl  *timer;
+    bool                running;
+    wxTimerDesc         *next, *prev;
+    wxTimerTick_t        shotTime;
+    volatile bool       *deleteFlag; // see comment in ~wxTimer

 };
 
 class wxTimerScheduler
 };
 
 class wxTimerScheduler


@@ -145,9 +135,8 @@ void wxTimerScheduler::NotifyTimers()
 
         for ( wxTimerDesc *desc = m_timers; desc; desc = desc->next )
         {
 
         for ( wxTimerDesc *desc = m_timers; desc; desc = desc->next )
         {

-            if ( desc->running && desc->shotTime <= now )
+            if ( desc->running && wxTickGreaterEqual(now, desc->shotTime) )

             {
             {

-                desc = m_timers;

                 oneShot = desc->timer->IsOneShot();
                 RemoveTimer(desc);
 
                 oneShot = desc->timer->IsOneShot();
                 RemoveTimer(desc);
 


@@ -167,6 +156,12 @@ void wxTimerScheduler::NotifyTimers()
                     if ( !oneShot )
                         QueueTimer(desc, now + desc->timer->GetInterval());
                 }
                     if ( !oneShot )
                         QueueTimer(desc, now + desc->timer->GetInterval());
                 }

+                else
+                {
+                    desc = m_timers;
+                    if (!desc)
+                        break;
+                }

             }
         }
     }
             }
         }
     }


@@ -177,18 +172,16 @@ void wxTimerScheduler::NotifyTimers()
 // wxTimer
 // ----------------------------------------------------------------------------
 
 // wxTimer
 // ----------------------------------------------------------------------------
 

-IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
-

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

-void wxTimer::Init()
+void wxGenericTimerImpl::Init()

 {
     if ( !gs_scheduler )
         gs_scheduler = new wxTimerScheduler;
     m_desc = new wxTimerDesc(this);
 }
 
 {
     if ( !gs_scheduler )
         gs_scheduler = new wxTimerScheduler;
     m_desc = new wxTimerDesc(this);
 }
 

-wxTimer::~wxTimer()
+wxGenericTimerImpl::~wxGenericTimerImpl()

 {
     wxLogTrace( wxT("timer"), wxT("destroying timer %p..."), this);
     if ( IsRunning() )
 {
     wxLogTrace( wxT("timer"), wxT("destroying timer %p..."), this);
     if ( IsRunning() )


@@ -205,31 +198,31 @@ wxTimer::~wxTimer()
     wxLogTrace( wxT("timer"), wxT("    ...done destroying timer %p..."), this);
 }
 
     wxLogTrace( wxT("timer"), wxT("    ...done destroying timer %p..."), this);
 }
 

-bool wxTimer::IsRunning() const
+bool wxGenericTimerImpl::IsRunning() const

 {
     return m_desc->running;
 }
 
 {
     return m_desc->running;
 }
 

-bool wxTimer::Start(int millisecs, bool oneShot)
+bool wxGenericTimerImpl::Start(int millisecs, bool oneShot)

 {
     wxLogTrace( wxT("timer"), wxT("started timer %p: %i ms, oneshot=%i"),
                this, millisecs, oneShot);
 
 {
     wxLogTrace( wxT("timer"), wxT("started timer %p: %i ms, oneshot=%i"),
                this, millisecs, oneShot);
 

-    if ( !wxTimerBase::Start(millisecs, oneShot) )
-        return false;
+     if ( !wxTimerImpl::Start(millisecs, oneShot) )
+         return false;

 
     gs_scheduler->QueueTimer(m_desc);
     return true;
 }
 
 
     gs_scheduler->QueueTimer(m_desc);
     return true;
 }
 

-void wxTimer::Stop()
+void wxGenericTimerImpl::Stop()

 {
     if ( !m_desc->running ) return;
 
     gs_scheduler->RemoveTimer(m_desc);
 }
 
 {
     if ( !m_desc->running ) return;
 
     gs_scheduler->RemoveTimer(m_desc);
 }
 

-/*static*/ void wxTimer::NotifyTimers()
+/*static*/ void wxGenericTimerImpl::NotifyTimers()

 {
     if ( gs_scheduler )
         gs_scheduler->NotifyTimers();
 {
     if ( gs_scheduler )
         gs_scheduler->NotifyTimers();


@@ -244,10 +237,19 @@ DECLARE_DYNAMIC_CLASS(wxTimerModule)
 public:
     wxTimerModule() {}
     bool OnInit() { return true; }
 public:
     wxTimerModule() {}
     bool OnInit() { return true; }

-    void OnExit() { delete gs_scheduler; gs_scheduler = NULL; }
+    void OnExit() { wxDELETE(gs_scheduler); }

 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxTimerModule, wxModule)
 
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxTimerModule, wxModule)
 

+// ----------------------------------------------------------------------------
+// wxGUIAppTraits
+// ----------------------------------------------------------------------------
+
+wxTimerImpl *wxGUIAppTraits::CreateTimerImpl(wxTimer *timer)
+{
+    return new wxGenericTimerImpl(timer);
+}
+

 
 #endif //wxUSE_TIMER
 
 #endif //wxUSE_TIMER