Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

applied patch to build wxMSW with CW7 (patch 550445)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15472 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-05-09 22:34:44 +00:00
parent 7cf46fdb3e
commit ba14d9861d
32 changed files with 30658 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/common/timercmn.cpp
View File

@@ -49,7 +49,7 @@
#include <windows.h>
#endif
#if defined(__WIN32__) && !defined(HAVE_FTIME)
#if defined(__WIN32__) && !defined(HAVE_FTIME) && !defined(__MWERKS__)
#define HAVE_FTIME
#endif
@@ -294,7 +294,24 @@ wxLongLong wxGetLocalTimeMillis()
// If possible, use a function which avoids conversions from
// broken-up time structures to milliseconds
#if defined(HAVE_GETTIMEOFDAY)
#if defined(__WXMSW__) && defined(__MWERKS__)
// This should probably be the way all WXMSW compilers should do it
// Go direct to the OS for time
SYSTEMTIME thenst = { 1970, 1, 4, 1, 0, 0, 0, 0 }; // 00:00:00 Jan 1st 1970
FILETIME thenft;
SystemTimeToFileTime( &thenst, &thenft );
wxLongLong then( thenft.dwHighDateTime, thenft.dwLowDateTime ); // time in 100 nanoseconds
SYSTEMTIME nowst;
GetLocalTime( &nowst );
FILETIME nowft;
SystemTimeToFileTime( &nowst, &nowft );
wxLongLong now( nowft.dwHighDateTime, nowft.dwLowDateTime ); // time in 100 nanoseconds
return ( now - then ) / 10000.0; // time from 00:00:00 Jan 1st 1970 to now in milliseconds
#elif defined(HAVE_GETTIMEOFDAY)
struct timeval tp;
if ( wxGetTimeOfDay(&tp, (struct timezone *)NULL) != -1 )
{