better learn the operators...

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

diff --git a/src/common/timercmn.cpp b/src/common/timercmn.cpp
index e2aea3bb678ce059f21a0b86e9ee991f79784a40..234ea9e0c29c81299a05b91369b552a236217921 100644 (file)
--- a/src/common/timercmn.cpp
+++ b/src/common/timercmn.cpp
@@ -55,7 +55,9 @@
 
 #if defined(__VISAGECPP__) && !defined(HAVE_FTIME)
     #define HAVE_FTIME
 
 #if defined(__VISAGECPP__) && !defined(HAVE_FTIME)
     #define HAVE_FTIME

-    #define ftime(x) _ftime(x)
+#  if __IBMCPP__ >= 400
+    #  define ftime(x) _ftime(x)
+#  endif

 #endif
 
 #include <time.h>
 #endif
 
 #include <time.h>


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


@@ -101,7 +103,7 @@
 // wxTimerBase
 // ----------------------------------------------------------------------------
 
 // wxTimerBase
 // ----------------------------------------------------------------------------
 

-#if wxUSE_GUI
+#if wxUSE_GUI && wxUSE_TIMER

 
 void wxTimerBase::Notify()
 {
 
 void wxTimerBase::Notify()
 {


@@ -113,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;


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


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


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


@@ -244,14 +274,15 @@ long wxGetUTCTime()
     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;


@@ -312,3 +343,6 @@ wxLongLong wxGetLocalTimeMillis()
 
 #endif // time functions
 }
 
 #endif // time functions
 }

+
+#endif // wxUSE_LONGLONG
+