JPEG handler does not read entire file into memory anymore (+, of course, that header...

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

diff --git a/src/common/timercmn.cpp b/src/common/timercmn.cpp
index 2b95979afdfa5f3d15a4915fd406e9ce166e334b..8a34f3cfda7975d70056d5f84ff845f328a2a8c1 100644 (file)
--- a/src/common/timercmn.cpp
+++ b/src/common/timercmn.cpp
@@ -36,7 +36,7 @@
 #include "wx/timer.h"
 
 // I'm told VMS is POSIX, so should have localtime()
 #include "wx/timer.h"
 
 // I'm told VMS is POSIX, so should have localtime()

-#if defined(__WXMSW__) || defined(__VMS__) || defined(__WXPM__)
+#if defined(__WXMSW__) || defined(__VMS__) || defined(__WXPM__) || defined(__WXMAC__)

     // configure might have found it already for us
     #ifndef HAVE_LOCALTIME
         #define HAVE_LOCALTIME
     // configure might have found it already for us
     #ifndef HAVE_LOCALTIME
         #define HAVE_LOCALTIME


@@ -136,6 +136,12 @@ long wxGetCurrentTime()
 // return GMT time in millisecond
 long wxGetCurrentMTime()
 {
 // return GMT time in millisecond
 long wxGetCurrentMTime()
 {

+#if defined(__WIN32__)
+    SYSTEMTIME st;
+    ::GetLocalTime(&st);
+
+    return 1000*(60*(60*st.wHour+st.wMinute)+st.wSecond)+st.wMilliseconds;
+#else

 #if defined(HAVE_LOCALTIME)
     time_t t0 = time(&t0);
     if ( t0 != (time_t)-1 )
 #if defined(HAVE_LOCALTIME)
     time_t t0 = time(&t0);
     if ( t0 != (time_t)-1 )


@@ -166,6 +172,7 @@ long wxGetCurrentMTime()
     wxLogSysError(_("Failed to get the system time"));
 
     return -1;
     wxLogSysError(_("Failed to get the system time"));
 
     return -1;

+#endif // __WIN32__/!__WIN32__

 }
 
 bool wxGetLocalTime(long *timeZone, int *dstObserved)
 }
 
 bool wxGetLocalTime(long *timeZone, int *dstObserved)