wxDFB: implemented Raise() and Lower() for TLWs

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

diff --git a/src/common/stopwatch.cpp b/src/common/stopwatch.cpp
index 6e0754d2d089cd78a1f620fa09e7ee4a7b1754fa..22ecaadecdf2ddd3f4cf8a35d1137b3e4aa7e0d8 100644 (file)
--- a/src/common/stopwatch.cpp
+++ b/src/common/stopwatch.cpp
@@ -58,12 +58,15 @@
 #   undef HAVE_GETTIMEOFDAY
 #endif
 
 #   undef HAVE_GETTIMEOFDAY
 #endif
 

+#ifndef __WXPALMOS5__

 #ifndef __WXWINCE__
 #include <time.h>
 #else
 #include "wx/msw/private.h"
 #include "wx/msw/wince/time.h"
 #endif
 #ifndef __WXWINCE__
 #include <time.h>
 #else
 #include "wx/msw/private.h"
 #include "wx/msw/wince/time.h"
 #endif

+#endif // __WXPALMOS5__
+

 
 #if !defined(__WXMAC__) && !defined(__WXWINCE__)
     #include <sys/types.h>      // for time_t
 
 #if !defined(__WXMAC__) && !defined(__WXWINCE__)
     #include <sys/types.h>      // for time_t


@@ -91,21 +94,6 @@
     #include <SystemMgr.h>
 #endif
 
     #include <SystemMgr.h>
 #endif
 

-// ----------------------------------------------------------------------------
-// macros
-// ----------------------------------------------------------------------------
-
-// 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
-        struct timezone;
-        #define wxGetTimeOfDay(tv, tz)      gettimeofday(tv)
-    #else
-        #define wxGetTimeOfDay(tv, tz)      gettimeofday((tv), (tz))
-    #endif
-#endif // HAVE_GETTIMEOFDAY
-

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


@@ -279,7 +267,7 @@ wxLongLong wxGetLocalTimeMillis()
 
 #elif defined(HAVE_GETTIMEOFDAY)
     struct timeval tp;
 
 #elif defined(HAVE_GETTIMEOFDAY)
     struct timeval tp;

-    if ( wxGetTimeOfDay(&tp, (struct timezone *)NULL) != -1 )
+    if ( wxGetTimeOfDay(&tp) != -1 )

     {
         val *= tp.tv_sec;
         return (val + (tp.tv_usec / 1000));
     {
         val *= tp.tv_sec;
         return (val + (tp.tv_usec / 1000));