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

Added HAVE_FTIME for all Windows compilers

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Guillermo Rodriguez Garcia
2000-03-03 13:51:28 +00:00
parent 1fc25a89ac
commit 91ff98b7b5
1 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/common/timercmn.cpp
View File

@@ -19,7 +19,7 @@
// ============================================================================ // ============================================================================
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// headers // wxWin headers
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#ifdef __GNUG__ #ifdef __GNUG__
@@ -41,10 +41,21 @@
#include "wx/timer.h" #include "wx/timer.h"
#include "wx/longlong.h" #include "wx/longlong.h"
// ----------------------------------------------------------------------------
// System headers
// ----------------------------------------------------------------------------
#if defined(__WIN32__) #if defined(__WIN32__)
#include <windows.h> #include <windows.h>
#endif #endif
#if defined(__WIN32__) && !defined(HAVE_FTIME)
#define HAVE_FTIME
#ifdef (__VISUALC__)
#define ftime _ftime
#endif
#endif
#include <time.h> #include <time.h>
#ifndef __WXMAC__ #ifndef __WXMAC__
#include <sys/types.h> // for time_t #include <sys/types.h> // for time_t
@@ -90,12 +101,12 @@ wxLongLong wxGetLocalTimeMillis();
// implementation // implementation
// ============================================================================ // ============================================================================
#if wxUSE_GUI
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxTimerBase // wxTimerBase
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#if wxUSE_GUI
void wxTimerBase::Notify() void wxTimerBase::Notify()
{ {
// the base class version generates an event if it has owner - which it // the base class version generates an event if it has owner - which it
@@ -253,12 +264,16 @@ wxLongLong wxGetLocalTimeMillis()
val *= tp.tv_sec; val *= tp.tv_sec;
return (val + (tp.tv_usec / 1000)); return (val + (tp.tv_usec / 1000));
} }
else
{
wxLogError(_("wxGetTimeOfDay failed."));
return 0; return 0;
}
#elif defined(HAVE_FTIME) #elif defined(HAVE_FTIME)
struct timeb tp; struct timeb tp;
// ftime() is void and not int in some mingw32 headers, so don't test the // ftime() is void and not int in some mingw32 headers, so don't
// return code (well, it shouldn't fail anyhow...) // test the return code (well, it shouldn't fail anyhow...)
(void)ftime(&tp); (void)ftime(&tp);
val *= tp.time; val *= tp.time;
return (val + tp.millitm); return (val + tp.millitm);
@@ -267,23 +282,27 @@ wxLongLong wxGetLocalTimeMillis()
// 00:00:00 Jan 1st 1970 and then whatever is available // 00:00:00 Jan 1st 1970 and then whatever is available
// to get millisecond resolution. // to get millisecond resolution.
// //
// TODO: This might lead to a problem if the clocks use // NOTE that this might lead to a problem if the clocks
// different sources. // use different sources, so this approach should be
// avoided where possible.
val *= wxGetLocalTime(); val *= wxGetLocalTime();
#if defined (__WIN32__) #if defined(__VISAGECPP__)
SYSTEMTIME st; #warning "Possible clock skew bug in wxStopWatch!"
::GetLocalTime(&st);
val += st.wMilliseconds;
#elif defined(__VISAGECPP__)
DATETIME dt; DATETIME dt;
::DosGetDateTime(&dt); ::DosGetDateTime(&dt);
val += (dt.hundredths*10); val += (dt.hundredths*10);
#elif defined (__WIN32__)
#warning "Possible clock skew bug in wxStopWatch!"
SYSTEMTIME st;
::GetLocalTime(&st);
val += st.wMilliseconds;
#else #else
#warning "wxStopWatch will be up to second resolution!" #warning "wxStopWatch will be up to second resolution!"
#endif #endif
return val; return val;
#endif #endif
} }