just some comments

[wxWidgets.git] / src / common / timercmn.cpp

diff --git a/src/common/timercmn.cpp b/src/common/timercmn.cpp
index 64dbb0aac2bcdcad7be03199feec4536dafc1082..c350e8ca5bfad362b459eddefc70c83883e88777 100644 (file)
--- a/src/common/timercmn.cpp
+++ b/src/common/timercmn.cpp
@@ -11,7 +11,7 @@
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 //              (c) 1999 Guillermo Rodriguez <guille@iies.es>
-// Licence:    wxWindows license
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -57,6 +57,12 @@
     #include <sys/timeb.h>
 #endif
 
+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxTimerEvent, wxEvent)
+
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
@@ -72,11 +78,29 @@
     #endif
 #endif // HAVE_GETTIMEOFDAY
 
+// ----------------------------------------------------------------------------
+// prototypes
+// ----------------------------------------------------------------------------
+
+wxLongLong wxGetLocalTimeMillis();
+
 // ============================================================================
 // implementation
 // ============================================================================
 
-wxLongLong wxGetLocalTimeMillis();
+// ----------------------------------------------------------------------------
+// wxTimerBase
+// ----------------------------------------------------------------------------
+
+void wxTimerBase::Notify()
+{
+    // the base class version generates an event if it has owner - which it
+    // should because otherwise nobody can process timer events
+    wxCHECK_RET( m_owner, _T("wxTimer::Notify() should be overridden.") );
+
+    wxTimerEvent event(m_idTimer, m_milli);
+    (void)m_owner->ProcessEvent(event);
+}
 
 // ----------------------------------------------------------------------------
 // wxStopWatch
@@ -89,14 +113,14 @@ void wxStopWatch::Start(long t)
     m_pause = 0;
 }
 
-long wxStopWatch::Time() const
+long wxStopWatch::GetElapsedTime() const
 {
-    return (m_pause ? m_pause : GetElapsedTime());
+    return (wxGetLocalTimeMillis() - m_t0).GetLo();
 }
 
-long wxStopWatch::GetElapsedTime() const
+long wxStopWatch::Time() const
 {
-    return (wxGetLocalTimeMillis() - m_t0).GetLo();
+    return (m_pause ? m_pause : GetElapsedTime());
 }
 
 // ----------------------------------------------------------------------------
@@ -221,6 +245,10 @@ wxLongLong wxGetLocalTimeMillis()
     SYSTEMTIME st;
     ::GetLocalTime(&st);
     return (val + st.wMilliseconds);
+#elif defined(__VISAGECPP__)
+    DATETIME    dt;
+    ::DosGetDateTime(&dt);
+    return (val + dt.hundredths*10);
 #elif defined(HAVE_GETTIMEOFDAY)
     struct timeval tp;
     if ( wxGetTimeOfDay(&tp, (struct timezone *)NULL) != -1 )
@@ -233,6 +261,10 @@ wxLongLong wxGetLocalTimeMillis()
     {
         return (val + tp.millitm);
     }
+#else
+#if !defined(__BORLANDC__) && !(defined(__VISUALC__) && defined(__WIN16__))
+    #warning "wxStopWatch will be up to second resolution!"
+#endif
 #endif
 
     return val;