wxHtmlWindow background drawing fixes for OS X and optimizations

[wxWidgets.git] / include / wx / stopwatch.h

diff --git a/include/wx/stopwatch.h b/include/wx/stopwatch.h
index 75f789592b1860440847f955c52756c1b8a94f8b..583c75a495242563f9db20f11fc9c3e54746437e 100644 (file)
--- a/include/wx/stopwatch.h
+++ b/include/wx/stopwatch.h
@@ -32,7 +32,7 @@ public:
     // pause the stop watch
     void Pause()
     {
     // pause the stop watch
     void Pause()
     {

-        if ( !m_pauseCount++ )
+        if ( m_pauseCount++ == 0 )

             m_pause = GetElapsedTime();
     }
 
             m_pause = GetElapsedTime();
     }
 


@@ -42,7 +42,7 @@ public:
         wxASSERT_MSG( m_pauseCount > 0,
                       _T("Resuming stop watch which is not paused") );
 
         wxASSERT_MSG( m_pauseCount > 0,
                       _T("Resuming stop watch which is not paused") );
 

-        if ( !--m_pauseCount )
+        if ( --m_pauseCount == 0 )

             Start(m_pause);
     }
 
             Start(m_pause);
     }
 


@@ -66,17 +66,17 @@ private:
 
 #endif // wxUSE_STOPWATCH
 
 
 #endif // wxUSE_STOPWATCH
 

-#if wxUSE_LONGLONG
+#if wxUSE_LONGLONG && WXWIN_COMPATIBILITY_2_6

 
 

-// Starts a global timer
-// -- DEPRECATED: use wxStopWatch instead
-void WXDLLIMPEXP_BASE wxStartTimer();
+    // Starts a global timer
+    // -- DEPRECATED: use wxStopWatch instead
+    wxDEPRECATED( void WXDLLIMPEXP_BASE wxStartTimer() );

 
 

-// Gets elapsed milliseconds since last wxStartTimer or wxGetElapsedTime
-// -- DEPRECATED: use wxStopWatch instead
-long WXDLLIMPEXP_BASE wxGetElapsedTime(bool resetTimer = true);
+    // Gets elapsed milliseconds since last wxStartTimer or wxGetElapsedTime
+    // -- DEPRECATED: use wxStopWatch instead
+    wxDEPRECATED( long WXDLLIMPEXP_BASE wxGetElapsedTime(bool resetTimer = true) );

 
 

-#endif // wxUSE_LONGLONG
+#endif // wxUSE_LONGLONG && WXWIN_COMPATIBILITY_2_6

 
 // ----------------------------------------------------------------------------
 // global time functions
 
 // ----------------------------------------------------------------------------
 // global time functions


@@ -90,8 +90,10 @@ extern long WXDLLIMPEXP_BASE wxGetUTCTime();
 
 #if wxUSE_LONGLONG
     typedef wxLongLong wxMilliClock_t;
 
 #if wxUSE_LONGLONG
     typedef wxLongLong wxMilliClock_t;

+    inline long wxMilliClockToLong(wxLongLong ll) { return ll.ToLong(); }

 #else
     typedef double wxMilliClock_t;
 #else
     typedef double wxMilliClock_t;

+    inline long wxMilliClockToLong(double d) { return wx_truncate_cast(long, d); }

 #endif // wxUSE_LONGLONG
 
 // Get number of milliseconds since local time 00:00:00 Jan 1st 1970
 #endif // wxUSE_LONGLONG
 
 // Get number of milliseconds since local time 00:00:00 Jan 1st 1970


@@ -99,5 +101,14 @@ extern wxMilliClock_t WXDLLIMPEXP_BASE wxGetLocalTimeMillis();
 
 #define wxGetCurrentTime() wxGetLocalTime()
 
 
 #define wxGetCurrentTime() wxGetLocalTime()
 

-#endif // _WX_STOPWATCH_H_
+// on some really old systems gettimeofday() doesn't have the second argument,
+// define wxGetTimeOfDay() to hide this difference
+#ifdef HAVE_GETTIMEOFDAY
+    #ifdef WX_GETTIMEOFDAY_NO_TZ
+        #define wxGetTimeOfDay(tv)      gettimeofday(tv)
+    #else
+        #define wxGetTimeOfDay(tv)      gettimeofday((tv), NULL)
+    #endif
+#endif // HAVE_GETTIMEOFDAY

 
 

+#endif // _WX_STOPWATCH_H_