Change wxGetCurrentUTime as wxGetCurrentMTime (milli not micro!)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3755 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/timer.h b/include/wx/timer.h
index 93d3f94f7c86bdfde09507c5006f3d8d8ce604d1..0dd07e0bed56adc312a1e4687e2c40d4399ae178 100644 (file)
--- a/include/wx/timer.h
+++ b/include/wx/timer.h
@@ -46,7 +46,7 @@ bool WXDLLEXPORT wxGetLocalTime(long *timeZone, int *dstObserved);
 long WXDLLEXPORT wxGetCurrentTime();
 
 // Get number of milliseconds since 00:00:00 GMT, Jan 1st 1970.
 long WXDLLEXPORT wxGetCurrentTime();
 
 // Get number of milliseconds since 00:00:00 GMT, Jan 1st 1970.

-long WXDLLEXPORT wxGetCurrentUTime();
+long WXDLLEXPORT wxGetCurrentMTime();

 
 #endif
     // _WX_TIMER_H_BASE_
 
 #endif
     // _WX_TIMER_H_BASE_

diff --git a/src/common/timercmn.cpp b/src/common/timercmn.cpp
index db6eeee6b8843adbe223ab4a134f22e3b1d3006c..b1556e325e252c2d37aab4b4085f8b1c94386393 100644 (file)
--- a/src/common/timercmn.cpp
+++ b/src/common/timercmn.cpp
@@ -73,14 +73,14 @@ extern "C" int gettimeofday(struct timeval *tp, void *);
 long wxStartTime = 0;
 void wxStartTimer(void)
 {
 long wxStartTime = 0;
 void wxStartTimer(void)
 {

-  wxStartTime=wxGetCurrentUTime();
+  wxStartTime=wxGetCurrentMTime();

 }
 
 // Returns elapsed time in milliseconds
 long wxGetElapsedTime(bool resetTimer)
 {
   long oldTime = wxStartTime;
 }
 
 // Returns elapsed time in milliseconds
 long wxGetElapsedTime(bool resetTimer)
 {
   long oldTime = wxStartTime;

-  long newTime=wxGetCurrentUTime();
+  long newTime=wxGetCurrentMTime();

 
   if (resetTimer) wxStartTime = newTime;
   return newTime - oldTime;
 
   if (resetTimer) wxStartTime = newTime;
   return newTime - oldTime;


@@ -90,11 +90,11 @@ long wxGetElapsedTime(bool resetTimer)
 // Get number of seconds since 00:00:00 GMT, Jan 1st 1970.
 long wxGetCurrentTime(void)
 {
 // Get number of seconds since 00:00:00 GMT, Jan 1st 1970.
 long wxGetCurrentTime(void)
 {

-  return wxGetCurrentUTime()/1000;
+  return wxGetCurrentMTime()/1000;

 }
 
 // return GMT time in millisecond
 }
 
 // return GMT time in millisecond

-long wxGetCurrentUTime()
+long wxGetCurrentMTime()

 {
 #if defined(__xlC__) || defined(__AIX__) || defined(__SVR4__) || defined(__SYSV__) || \
     (defined(__GNUWIN32__) && !defined(__MINGW32__)) // || defined(__AIXV3__)
 {
 #if defined(__xlC__) || defined(__AIX__) || defined(__SVR4__) || defined(__SYSV__) || \
     (defined(__GNUWIN32__) && !defined(__MINGW32__)) // || defined(__AIXV3__)


@@ -132,25 +132,25 @@ wxChrono::wxChrono()
 
 void wxChrono::Start(long t)
 {
 
 void wxChrono::Start(long t)
 {

-  m_t0=wxGetCurrentUTime()-t;
+  m_t0=wxGetCurrentMTime()-t;

   m_pause=0;
 }
 
 void wxChrono::Pause()
 {
   m_pause=0;
 }
 
 void wxChrono::Pause()
 {

-  m_pause=wxGetCurrentUTime()-m_t0;
+  m_pause=wxGetCurrentMTime()-m_t0;

 }
 
 void wxChrono::Resume()
 {
 }
 
 void wxChrono::Resume()
 {

-  m_t0=wxGetCurrentUTime()-m_pause;
+  m_t0=wxGetCurrentMTime()-m_pause;

   m_pause=0;
 }
 
 long wxChrono::Time()
 {
   if (m_pause) return m_pause;
   m_pause=0;
 }
 
 long wxChrono::Time()
 {
   if (m_pause) return m_pause;

-  return wxGetCurrentUTime()-m_t0;
+  return wxGetCurrentMTime()-m_t0;

 }
 
 
 }