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

CW Win32 support

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1249 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
1998-12-21 08:44:48 +00:00
parent 518f33a4e5
commit 469e1e5c35
10 changed files with 1805 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/common/timercmn.cpp
View File

@@ -35,7 +35,7 @@
#include <time.h>
#include <sys/types.h>
#if (!defined(__SC__) && !defined(__SGI__) && !defined(__GNUWIN32__)) || defined(__MINGW32__)
#if (!defined(__SC__) && !defined(__SGI__) && !defined(__GNUWIN32__) && !defined(__MWERKS__)) || defined(__MINGW32__)
#include <sys/timeb.h>
#endif
@@ -76,7 +76,7 @@ void wxStartTimer(void)
gettimeofday(&tp);
#endif
wxStartTime = 1000*tp.tv_sec + tp.tv_usec/1000;
#elif (defined(__SC__) || defined(__SGI__) || defined(___BSDI__) || defined(__ALPHA__) || defined(__MINGW32__))
#elif (defined(__SC__) || defined(__SGI__) || defined(___BSDI__) || defined(__ALPHA__) || defined(__MINGW32__) || defined(__MWERKS__))
time_t t0;
struct tm *tp;
time(&t0);
@@ -103,7 +103,7 @@ long wxGetElapsedTime(bool resetTimer)
long newTime = 1000*tp.tv_sec + tp.tv_usec / 1000;
if (resetTimer)
wxStartTime = newTime;
#elif (defined(__SC__) || defined(__SGI__) || defined(___BSDI__) || defined(__ALPHA__) || defined(__MINGW32__))
#elif (defined(__SC__) || defined(__SGI__) || defined(___BSDI__) || defined(__ALPHA__) || defined(__MINGW32__)|| defined(__MWERKS__))
time_t t0;
struct tm *tp;
time(&t0);
@@ -145,7 +145,7 @@ bool wxGetLocalTime(long *timeZone, int *dstObserved)
*dstObserved = tp->tm_isdst;
#else
#if (((defined(__SYSV__) && !defined(__HPUX__)) || defined(__MSDOS__) || defined(__WXMSW__)) && !defined(__GNUWIN32__))
#if (((defined(__SYSV__) && !defined(__HPUX__)) || defined(__MSDOS__) || defined(__WXMSW__)) && !defined(__GNUWIN32__) && !defined(__MWERKS__))
#ifdef __BORLANDC__
/* Borland uses underscores */
*timeZone = _timezone;
@@ -154,8 +154,10 @@ bool wxGetLocalTime(long *timeZone, int *dstObserved)
*timeZone = timezone;
*dstObserved = daylight;
#endif
#elif defined(__xlC__) || defined(__AIX__) || defined(__SVR4__) || defined(__SYSV__) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) // || defined(__AIXV3__)
#elif defined(__xlC__) || defined(__AIX__) || defined(__SVR4__) || defined(__SYSV__) || defined(__MWERKS__) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) // || defined(__AIXV3__)
#ifndef __MWERKS__ // shouldn't this be one scope below ?
struct timeval tp;
#endif
#if defined(__SYSV__) || (defined(__GNUWIN32__) && !defined(__MINGW32))
struct timezone tz;
gettimeofday(&tp, &tz);
@@ -166,7 +168,11 @@ bool wxGetLocalTime(long *timeZone, int *dstObserved)
struct tm *tp;
time(&t0);
tp = localtime(&t0);
#ifndef __MWERKS__
*timeZone = tp->tm_gmtoff; // ???
#else
*timeZone = 0 ;
#endif
*dstObserved = tp->tm_isdst;
#endif
#elif defined(__WXSTUBS__)