Fix wxListCtrl background colour bug Part I

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

diff --git a/src/common/timercmn.cpp b/src/common/timercmn.cpp
index ae3453a6f1baf6aa3317f5e0dbfa6b6ef75da5d0..1d89b6507d7184c607b8ecfdb7e257eb4bac6318 100644 (file)
--- a/src/common/timercmn.cpp
+++ b/src/common/timercmn.cpp
@@ -60,6 +60,11 @@
 #  endif
 #endif
 
 #  endif
 #endif
 

+#if defined(__MWERKS__) && defined(__WXMSW__)
+#   undef HAVE_FTIME
+#   undef HAVE_GETTIMEOFDAY
+#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


@@ -76,7 +81,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
 


@@ -103,7 +108,12 @@
 // wxTimerBase
 // ----------------------------------------------------------------------------
 
 // wxTimerBase
 // ----------------------------------------------------------------------------
 

-#if wxUSE_GUI
+#if wxUSE_GUI && wxUSE_TIMER
+
+wxTimerBase::~wxTimerBase()
+{
+    // this destructor is required for Darwin
+}

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


@@ -141,6 +151,8 @@ bool wxTimerBase::Start(int milliseconds, bool oneShot)
 // wxStopWatch
 // ----------------------------------------------------------------------------
 
 // wxStopWatch
 // ----------------------------------------------------------------------------
 

+#if wxUSE_LONGLONG
+

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


@@ -149,18 +161,22 @@ void wxStopWatch::Start(long t)
 
 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
 {

-    return (m_pause ? m_pause : GetElapsedTime());
+    return m_pauseCount ? 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


@@ -181,6 +197,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


@@ -221,7 +238,7 @@ long wxGetLocalTime()
 long wxGetUTCTime()
 {
     struct tm tm;
 long wxGetUTCTime()
 {
     struct tm tm;

-       struct tm *ptm;
+    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


@@ -267,6 +284,7 @@ long wxGetUTCTime()
     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()


@@ -322,7 +340,7 @@ wxLongLong wxGetLocalTimeMillis()
     // do NOT just shut off these warnings, drop me a line instead at
     // <guille@iies.es>
 
     // do NOT just shut off these warnings, drop me a line instead at
     // <guille@iies.es>
 

-    #if defined(__VISUALC__)
+    #if defined(__VISUALC__) || defined (__WATCOMC__)

         #pragma message("wxStopWatch will be up to second resolution!")
     #elif defined(__BORLANDC__)
         #pragma message "wxStopWatch will be up to second resolution!"
         #pragma message("wxStopWatch will be up to second resolution!")
     #elif defined(__BORLANDC__)
         #pragma message "wxStopWatch will be up to second resolution!"


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

+
+#endif // wxUSE_LONGLONG
+