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

Applied #9668: made wxGetTimeZone() dynamic

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62097 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2009-09-24 19:12:31 +00:00
parent 5b806097fd
commit 5e3566ffaf
1 changed files with 13 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/common/datetime.cpp
View File

@@ -130,14 +130,9 @@ wxCUSTOM_TYPE_INFO(wxDateTime, wxToStringConverter<wxDateTime> , wxFromStringCon
#include <values.h> #include <values.h>
static long wxGetTimeZone() static long wxGetTimeZone()
{ {
static long timezone = MAXLONG; // invalid timezone struct timeb tb;
if (timezone == MAXLONG) ftime(&tb);
{ return tb.timezone;
struct timeb tb;
ftime(&tb);
timezone = tb.timezone;
}
return timezone;
} }
#define WX_TIMEZONE wxGetTimeZone() #define WX_TIMEZONE wxGetTimeZone()
#elif defined(__DARWIN__) #elif defined(__DARWIN__)
@@ -148,28 +143,18 @@ wxCUSTOM_TYPE_INFO(wxDateTime, wxToStringConverter<wxDateTime> , wxFromStringCon
// Solution (1): use the function equivalent of _timezone // Solution (1): use the function equivalent of _timezone
static long wxGetTimeZone() static long wxGetTimeZone()
{ {
static long s_Timezone = MAXLONG; // invalid timezone long t;
if (s_Timezone == MAXLONG) _get_timezone(& t);
{ return t;
int t;
_get_timezone(& t);
s_Timezone = (long) t;
}
return s_Timezone;
} }
#define WX_TIMEZONE wxGetTimeZone() #define WX_TIMEZONE wxGetTimeZone()
#elif 1 #elif 1
// Solution (2): using GetTimeZoneInformation // Solution (2): using GetTimeZoneInformation
static long wxGetTimeZone() static long wxGetTimeZone()
{ {
static long timezone = MAXLONG; // invalid timezone TIME_ZONE_INFORMATION tzi;
if (timezone == MAXLONG) ::GetTimeZoneInformation(&tzi);
{ return tzi.Bias; // x 60
TIME_ZONE_INFORMATION tzi;
::GetTimeZoneInformation(&tzi);
timezone = tzi.Bias;
}
return timezone;
} }
#define WX_TIMEZONE wxGetTimeZone() #define WX_TIMEZONE wxGetTimeZone()
#else #else
@@ -385,6 +370,7 @@ wxDateTime::wxDateTime_t GetNumOfDaysInMonth(int year, wxDateTime::Month month)
// NOTE: not static because used by datetimefmt.cpp // NOTE: not static because used by datetimefmt.cpp
int GetTimeZone() int GetTimeZone()
{ {
#ifdef WX_GMTOFF_IN_TM
// set to true when the timezone is set // set to true when the timezone is set
static bool s_timezoneSet = false; static bool s_timezoneSet = false;
static long gmtoffset = LONG_MAX; // invalid timezone static long gmtoffset = LONG_MAX; // invalid timezone
@@ -400,17 +386,15 @@ int GetTimeZone()
wxLocaltime_r(&t, &tm); wxLocaltime_r(&t, &tm);
s_timezoneSet = true; s_timezoneSet = true;
#ifdef WX_GMTOFF_IN_TM
// note that GMT offset is the opposite of time zone and so to return // note that GMT offset is the opposite of time zone and so to return
// consistent results in both WX_GMTOFF_IN_TM and !WX_GMTOFF_IN_TM // consistent results in both WX_GMTOFF_IN_TM and !WX_GMTOFF_IN_TM
// cases we have to negate it // cases we have to negate it
gmtoffset = -tm.tm_gmtoff; gmtoffset = -tm.tm_gmtoff;
#else // !WX_GMTOFF_IN_TM
gmtoffset = WX_TIMEZONE;
#endif // WX_GMTOFF_IN_TM/!WX_GMTOFF_IN_TM
} }
return (int)gmtoffset; return (int)gmtoffset;
#else // !WX_GMTOFF_IN_TM
return WX_TIMEZONE;
#endif // WX_GMTOFF_IN_TM/!WX_GMTOFF_IN_TM
} }
// return the integral part of the JDN for the midnight of the given date (to // return the integral part of the JDN for the midnight of the given date (to