linking fixes

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

diff --git a/src/common/timercmn.cpp b/src/common/timercmn.cpp
index 5f6f2f05a772274279a3fa0a81ff5d68a7d586d9..234ea9e0c29c81299a05b91369b552a236217921 100644 (file)
--- a/src/common/timercmn.cpp
+++ b/src/common/timercmn.cpp
@@ -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


@@ -61,7 +76,7 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
 // wxWin macros
 // ----------------------------------------------------------------------------
 

-#if wxUSE_GUI
+#if wxUSE_GUI && wxUSE_TIMER

     IMPLEMENT_DYNAMIC_CLASS(wxTimerEvent, wxEvent)
 #endif // wxUSE_GUI
 
     IMPLEMENT_DYNAMIC_CLASS(wxTimerEvent, wxEvent)
 #endif // wxUSE_GUI
 


@@ -80,22 +95,16 @@
     #endif
 #endif // HAVE_GETTIMEOFDAY
 
     #endif
 #endif // HAVE_GETTIMEOFDAY
 

-// ----------------------------------------------------------------------------
-// prototypes
-// ----------------------------------------------------------------------------
-
-wxLongLong wxGetLocalTimeMillis();
-

 // ============================================================================
 // implementation
 // ============================================================================
 
 // ============================================================================
 // implementation
 // ============================================================================
 

-#if wxUSE_GUI
-

 // ----------------------------------------------------------------------------
 // wxTimerBase
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // wxTimerBase
 // ----------------------------------------------------------------------------
 

+#if wxUSE_GUI && wxUSE_TIMER
+

 void wxTimerBase::Notify()
 {
     // the base class version generates an event if it has owner - which it
 void wxTimerBase::Notify()
 {
     // the base class version generates an event if it has owner - which it


@@ -106,12 +115,34 @@ void wxTimerBase::Notify()
     (void)m_owner->ProcessEvent(event);
 }
 
     (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
 // ----------------------------------------------------------------------------
 
 #endif // wxUSE_GUI
 
 // ----------------------------------------------------------------------------
 // wxStopWatch
 // ----------------------------------------------------------------------------
 

+#if wxUSE_LONGLONG
+

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


@@ -128,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


@@ -152,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


@@ -191,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


@@ -224,22 +261,28 @@ 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()
 {
     wxLongLong val = 1000l;
 
 
 // Get local time as milliseconds since 00:00:00, Jan 1st 1970
 wxLongLong wxGetLocalTimeMillis()
 {
     wxLongLong val = 1000l;
 

-    // If possible, use a functin which avoids conversions from
-    // broken-up time structures to milliseconds,
+    // If possible, use a function which avoids conversions from
+    // broken-up time structures to milliseconds

 
 #if defined(HAVE_GETTIMEOFDAY)
     struct timeval tp;
 
 #if defined(HAVE_GETTIMEOFDAY)
     struct timeval tp;


@@ -248,37 +291,58 @@ wxLongLong wxGetLocalTimeMillis()
         val *= tp.tv_sec;
         return (val + (tp.tv_usec / 1000));
     }
         val *= tp.tv_sec;
         return (val + (tp.tv_usec / 1000));
     }

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

     {
     {

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

     }
     }

-#else
+#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.
     //
     // We use wxGetLocalTime() to get the seconds since
     // 00:00:00 Jan 1st 1970 and then whatever is available
     // to get millisecond resolution.
     //

-    // TODO: This might lead to a problem if the clocks use
-    //       different sources.
+    // NOTE that this might lead to a problem if the clocks
+    // use different sources, so this approach should be
+    // avoided where possible.

 
     val *= wxGetLocalTime();
 
 
     val *= wxGetLocalTime();
 

+// GRG: This will go soon as all WIN32 seem to have ftime

 #if defined (__WIN32__)
 #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;
     SYSTEMTIME st;
     ::GetLocalTime(&st);
     val += st.wMilliseconds;

-#elif defined(__VISAGECPP__)
-    DATETIME dt;
-    ::DosGetDateTime(&dt);
-    val += (dt.hundredths*10);
-#else
-#warning "wxStopWatch will be up to second resolution!"
+#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
+#endif // time functions

 }
 }

+
+#endif // wxUSE_LONGLONG
+