use wxWindows zlib.h instead of Mac OS X system zlib.h directly

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

diff --git a/src/common/timercmn.cpp b/src/common/timercmn.cpp
index 2a17f8cf239d80b9b33fc68186e644a882db7d82..234ea9e0c29c81299a05b91369b552a236217921 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>
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 //              (c) 1999 Guillermo Rodriguez <guille@iies.es>

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -19,7 +19,7 @@
 // ============================================================================
 
 // ----------------------------------------------------------------------------
 // ============================================================================
 
 // ----------------------------------------------------------------------------

-// headers
+// wxWin headers

 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__


@@ -41,10 +41,25 @@
 #include "wx/timer.h"
 #include "wx/longlong.h"
 
 #include "wx/timer.h"
 #include "wx/longlong.h"
 

+// ----------------------------------------------------------------------------
+// System headers
+// ----------------------------------------------------------------------------
+

 #if defined(__WIN32__)
     #include <windows.h>
 #endif
 
 #if defined(__WIN32__)
     #include <windows.h>
 #endif
 

+#if defined(__WIN32__) && !defined(HAVE_FTIME)
+    #define HAVE_FTIME
+#endif
+
+#if defined(__VISAGECPP__) && !defined(HAVE_FTIME)
+    #define HAVE_FTIME
+#  if __IBMCPP__ >= 400
+    #  define ftime(x) _ftime(x)
+#  endif
+#endif
+

 #include <time.h>
 #ifndef __WXMAC__
     #include <sys/types.h>      // for time_t
 #include <time.h>
 #ifndef __WXMAC__
     #include <sys/types.h>      // for time_t


@@ -57,6 +72,14 @@
     #include <sys/timeb.h>
 #endif
 
     #include <sys/timeb.h>
 #endif
 

+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------
+
+#if wxUSE_GUI && wxUSE_TIMER
+    IMPLEMENT_DYNAMIC_CLASS(wxTimerEvent, wxEvent)
+#endif // wxUSE_GUI
+

 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------


@@ -76,22 +99,59 @@
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

-wxLongLong wxGetLocalTimeMillis();
+// ----------------------------------------------------------------------------
+// wxTimerBase
+// ----------------------------------------------------------------------------
+
+#if wxUSE_GUI && wxUSE_TIMER
+
+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);
+}
+
+bool wxTimerBase::Start(int milliseconds, bool oneShot)
+{
+    if ( IsRunning() )
+    {
+        // not stopping the already running timer might work for some
+        // platforms (no problems under MSW) but leads to mysterious crashes
+        // on the others (GTK), so to be on the safe side do it here
+        Stop();
+    }
+
+    if ( milliseconds != -1 )
+    {
+        m_milli = milliseconds;
+    }
+
+    m_oneShot = oneShot;
+
+    return TRUE;
+}
+
+#endif // wxUSE_GUI

 
 // ----------------------------------------------------------------------------
 // wxStopWatch
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxStopWatch
 // ----------------------------------------------------------------------------
 

+#if wxUSE_LONGLONG
+

 void wxStopWatch::Start(long t)
 {
     m_t0 = wxGetLocalTimeMillis() - t;
 void wxStopWatch::Start(long t)
 {
     m_t0 = wxGetLocalTimeMillis() - t;

-

     m_pause = 0;
 }
 
     m_pause = 0;
 }
 

-inline long wxStopWatch::GetElapsedTime() const
+long wxStopWatch::GetElapsedTime() const

 {
 {

-    return (wxGetLocalTimeMillis() - m_t0).GetLo();
+  return (wxGetLocalTimeMillis() - m_t0).GetLo();

 }
 
 long wxStopWatch::Time() const
 }
 
 long wxStopWatch::Time() const


@@ -99,10 +159,14 @@ long wxStopWatch::Time() const
     return (m_pause ? m_pause : GetElapsedTime());
 }
 
     return (m_pause ? m_pause : GetElapsedTime());
 }
 

+#endif // wxUSE_LONGLONG
+

 // ----------------------------------------------------------------------------
 // old timer functions superceded by wxStopWatch
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // old timer functions superceded by wxStopWatch
 // ----------------------------------------------------------------------------
 

+#if wxUSE_LONGLONG
+

 static wxLongLong wxStartTime = 0l;
 
 // starts the global timer
 static wxLongLong wxStartTime = 0l;
 
 // starts the global timer


@@ -123,6 +187,7 @@ long wxGetElapsedTime(bool resetTimer)
     return (newTime - oldTime).GetLo();
 }
 
     return (newTime - oldTime).GetLo();
 }
 

+#endif // wxUSE_LONGLONG

 
 // ----------------------------------------------------------------------------
 // the functions to get the current time and timezone info
 
 // ----------------------------------------------------------------------------
 // the functions to get the current time and timezone info


@@ -162,7 +227,8 @@ long wxGetLocalTime()
 // Get UTC time as seconds since 00:00:00, Jan 1st 1970
 long wxGetUTCTime()
 {
 // Get UTC time as seconds since 00:00:00, Jan 1st 1970
 long wxGetUTCTime()
 {

-    struct tm tm, *ptm;
+    struct tm tm;
+    struct tm *ptm;

     time_t t0, t1;
 
     // This cannot be made static because mktime can overwrite it
     time_t t0, t1;
 
     // This cannot be made static because mktime can overwrite it


@@ -195,47 +261,88 @@ long wxGetUTCTime()
 
             if (t0 != (time_t)-1 )
                 return (long)difftime(t1, t0) + (60 * 60 * 24 * 4);
 
             if (t0 != (time_t)-1 )
                 return (long)difftime(t1, t0) + (60 * 60 * 24 * 4);

-            wxLogSysError(_("Failed 2nd mktime"));
+            wxLogSysError(_("mktime() failed"));
+        }
+        else
+        {
+            wxLogSysError(_("gmtime() failed"));

         }
         }

-        wxLogSysError(_("Failed gmtime"));

     }
     }

-    wxLogSysError(_("Failed to get the UTC system time"));
+
+    wxLogError(_("Failed to get the UTC system time."));
+

     return -1;
 }
 
     return -1;
 }
 

+#if wxUSE_LONGLONG

 
 // Get local time as milliseconds since 00:00:00, Jan 1st 1970
 wxLongLong wxGetLocalTimeMillis()
 {
 
 // Get local time as milliseconds since 00:00:00, Jan 1st 1970
 wxLongLong wxGetLocalTimeMillis()
 {

-    // We use wxGetLocalTime() to get the seconds since
-    // 00:00:00 Jan 1st 1970 and then whatever is available
-    // to get millisecond resolution.
-    //

     wxLongLong val = 1000l;
     wxLongLong val = 1000l;

-    val *= wxGetLocalTime();

 
 

-    // If we got here, do not fail even if we can't get
-    // millisecond resolution.
-    //
-#if defined(__WIN32__)
-    SYSTEMTIME st;
-    ::GetLocalTime(&st);
-    return (val + st.wMilliseconds);
-#elif defined(HAVE_GETTIMEOFDAY)
+    // If possible, use a function which avoids conversions from
+    // broken-up time structures to milliseconds
+
+#if defined(HAVE_GETTIMEOFDAY)

     struct timeval tp;
     if ( wxGetTimeOfDay(&tp, (struct timezone *)NULL) != -1 )
     {
     struct timeval tp;
     if ( wxGetTimeOfDay(&tp, (struct timezone *)NULL) != -1 )
     {

+        val *= tp.tv_sec;

         return (val + (tp.tv_usec / 1000));
     }
         return (val + (tp.tv_usec / 1000));
     }

-#elif defined(HAVE_FTIME)
-    struct timeb tp;
-    if ( ftime(&tp) == 0 )
+    else

     {
     {

-        return (val + tp.millitm);
+        wxLogError(_("wxGetTimeOfDay failed."));
+        return 0;

     }
     }

-#else
-    #warning "wxStopWatch will be up to second resolution!"
+#elif defined(HAVE_FTIME)
+    struct timeb tp;
+
+    // ftime() is void and not int in some mingw32 headers, so don't
+    // test the return code (well, it shouldn't fail anyhow...)
+    (void)ftime(&tp);
+    val *= tp.time;
+    return (val + tp.millitm);
+#else // no gettimeofday() nor ftime()
+    // We use wxGetLocalTime() to get the seconds since
+    // 00:00:00 Jan 1st 1970 and then whatever is available
+    // to get millisecond resolution.
+    //
+    // NOTE that this might lead to a problem if the clocks
+    // use different sources, so this approach should be
+    // avoided where possible.
+
+    val *= wxGetLocalTime();
+
+// GRG: This will go soon as all WIN32 seem to have ftime
+#if defined (__WIN32__)
+    // If your platform/compiler needs to use two different functions
+    // to get ms resolution, please do NOT just shut off these warnings,
+    // drop me a line instead at <guille@iies.es>
+    #warning "Possible clock skew bug in wxGetLocalTimeMillis()!"
+
+    SYSTEMTIME st;
+    ::GetLocalTime(&st);
+    val += st.wMilliseconds;
+#else // !Win32
+    // If your platform/compiler does not support ms resolution please
+    // do NOT just shut off these warnings, drop me a line instead at
+    // <guille@iies.es>
+
+    #if defined(__VISUALC__)
+        #pragma message("wxStopWatch will be up to second resolution!")
+    #elif defined(__BORLANDC__)
+        #pragma message "wxStopWatch will be up to second resolution!"
+    #else
+        #warning "wxStopWatch will be up to second resolution!"
+    #endif // compiler

 #endif
 
     return val;
 #endif
 
     return val;

+
+#endif // time functions

 }
 }

+
+#endif // wxUSE_LONGLONG
+