corrected hit-testing for mac

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

diff --git a/src/generic/timer.cpp b/src/generic/timer.cpp
index 39974a6b8e361efac41926879df2acce05aea7cb..a4afe39e25d30d060b57a63fd464a518363480df 100644 (file)
--- a/src/generic/timer.cpp
+++ b/src/generic/timer.cpp
@@ -3,11 +3,11 @@
 // Purpose:     wxTimer implementation
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Purpose:     wxTimer implementation
 // Author:      Vaclav Slavik
 // Id:          $Id$

-// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
+// Copyright:   (c) Vaclav Slavik

 // 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
 


@@ -41,9 +41,13 @@
     // if we are unlucky and the latter combines information from two sources.
     #include "wx/mgl/private.h"
     extern "C" ulong _EVT_getTicks();
     // 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 _EVT_getTicks
+
+    typedef ulong wxTimerTick_t;

 #else
 #else

-    #define GetMillisecondsTime() wxGetLocalTimeMillis().ToLong()
+    #define GetMillisecondsTime wxGetLocalTimeMillis
+
+    typedef wxLongLong wxTimerTick_t;

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -60,7 +64,7 @@ public:
     wxTimer         *timer;
     bool             running;
     wxTimerDesc     *next, *prev;
     wxTimer         *timer;
     bool             running;
     wxTimerDesc     *next, *prev;

-    unsigned long    shotTime;  
+    wxTimerTick_t    shotTime;  

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


@@ -69,7 +73,7 @@ class wxTimerScheduler
 public:
     wxTimerScheduler() : m_timers(NULL) {}
 
 public:
     wxTimerScheduler() : m_timers(NULL) {}
 

-    void QueueTimer(wxTimerDesc *desc, unsigned long when = 0);
+    void QueueTimer(wxTimerDesc *desc, wxTimerTick_t when = 0);

     void RemoveTimer(wxTimerDesc *desc);
     void NotifyTimers();
    
     void RemoveTimer(wxTimerDesc *desc);
     void NotifyTimers();
    


@@ -77,7 +81,7 @@ private:
     wxTimerDesc *m_timers;
 };
 
     wxTimerDesc *m_timers;
 };
 

-void wxTimerScheduler::QueueTimer(wxTimerDesc *desc, unsigned long when)
+void wxTimerScheduler::QueueTimer(wxTimerDesc *desc, wxTimerTick_t when)

 {
     if ( desc->running )
         return; // already scheduled
 {
     if ( desc->running )
         return; // already scheduled


@@ -87,8 +91,11 @@ void wxTimerScheduler::QueueTimer(wxTimerDesc *desc, unsigned long when)
     desc->shotTime = when;
     desc->running = TRUE;
 
     desc->shotTime = when;
     desc->running = TRUE;
 

-    wxLogTrace("timer", "queued timer %p at tick %i", 
-               desc->timer, when);
+#ifndef __WXMGL__
+    wxLogTrace( wxT("timer"),
+                wxT("queued timer %p at tick %") wxLongLongFmtSpec _T("d"), 
+               desc->timer,  when.GetValue());
+#endif

 
     if ( m_timers )
     {
 
     if ( m_timers )
     {


@@ -125,7 +132,7 @@ void wxTimerScheduler::NotifyTimers()
     {
         bool oneShot;
         volatile bool timerDeleted;
     {
         bool oneShot;
         volatile bool timerDeleted;

-        unsigned long now = GetMillisecondsTime();
+        wxTimerTick_t now = GetMillisecondsTime();

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


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

-                wxLogTrace("timer", "notified timer %p sheduled for %i", 
-                           desc->timer, 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 )
 
                 desc->deleteFlag = NULL;
                 if ( !oneShot )


@@ -169,7 +179,7 @@ void wxTimer::Init()
 
 wxTimer::~wxTimer()
 {
 
 wxTimer::~wxTimer()
 {

-    wxLogTrace("timer", "destroying timer %p...", this);
+    wxLogTrace( wxT("timer"), wxT("destroying timer %p..."), this);

     if ( IsRunning() )
         Stop();
 
     if ( IsRunning() )
         Stop();
 


@@ -181,7 +191,7 @@ wxTimer::~wxTimer()
         *m_desc->deleteFlag = TRUE;
 
     delete m_desc;
         *m_desc->deleteFlag = TRUE;
 
     delete m_desc;

-    wxLogTrace("timer", "    ...done destroying timer %p...", this);
+    wxLogTrace( wxT("timer"), wxT("    ...done destroying timer %p..."), this);

 }
 
 bool wxTimer::IsRunning() const
 }
 
 bool wxTimer::IsRunning() const


@@ -191,7 +201,7 @@ bool wxTimer::IsRunning() const
 
 bool wxTimer::Start(int millisecs, bool oneShot)
 {
 
 bool wxTimer::Start(int millisecs, bool oneShot)
 {

-    wxLogTrace("timer", "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) )