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

Do nothing when converting wxDateTime to/from local time zone

Browse Source 
In particular, do not (unexpectedly) adjust time by the DST.

Closes #16585.

See #10445.
This commit is contained in:
Vadim Zeitlin
2017-11-29 23:15:57 +01:00
parent 543c522cb8
commit c7c30504c8
3 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/datetime.cpp
View File

@@ -2094,11 +2094,11 @@ wxDateTime& wxDateTime::MakeTimezone(const TimeZone& tz, bool noDST)
{
long secDiff = wxGetTimeZone() + tz.GetOffset();
// We are converting from the local time, but local time zone does not
// include the DST offset (as it varies depending on the date), so we have
// to handle DST manually, unless a special flag inhibiting this was
// specified.
if ( !noDST && (IsDST() == 1) )
// We are converting from the local time to some other time zone, but local
// time zone does not include the DST offset (as it varies depending on the
// date), so we have to handle DST manually, unless a special flag
// inhibiting this was specified.
if ( !noDST && (IsDST() == 1) && !tz.IsLocal() )
{
secDiff -= DST_OFFSET;
}
@@ -2111,7 +2111,7 @@ wxDateTime& wxDateTime::MakeFromTimezone(const TimeZone& tz, bool noDST)
long secDiff = wxGetTimeZone() + tz.GetOffset();
// See comment in MakeTimezone() above, the logic here is exactly the same.
if ( !noDST && (IsDST() == 1) )
if ( !noDST && (IsDST() == 1) && !tz.IsLocal() )
{
secDiff -= DST_OFFSET;
}