From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 23 Jun 2004 21:53:15 +0000 (+0000)
Subject: fixed bug in wxDateTime::Set(jdn) when DST was in effect
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/8cc00d5fcafccb2fc2c3fa2eda78651a5634aab2

fixed bug in wxDateTime::Set(jdn) when DST was in effect


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27983 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/docs/changes.txt b/docs/changes.txt
index 0f387c8a35..1f6c6e447b 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -108,6 +108,7 @@ All:
 
 - number of fixes to wxPluginManager (Rick Brice, Hans Van Leemputten)
 - fixed memory leak in wxURL when using a proxy (Steven Van Ingelgem)
+- fixed bug in wxDateTime::Set(jdn) when DST was in effect
 - it's now possible to use msgids in other languages than English with
   wxLocale (based on patch by Stefan Kowski)
 
diff --git a/src/common/datetime.cpp b/src/common/datetime.cpp
index 9c14cc43db..2b208928df 100644
--- a/src/common/datetime.cpp
+++ b/src/common/datetime.cpp
@@ -1287,6 +1287,17 @@ wxDateTime& wxDateTime::Set(double jdn)
 
     jdn *= MILLISECONDS_PER_DAY;
 
+    // JDNs always suppose an UTC date, so bring it back to local time zone
+    // (also see GetJulianDayNumber() implementation)
+    long tzDiff = GetTimeZone();
+    if ( IsDST() == 1 )
+    {
+        // FIXME: again, we suppose that DST is always one hour
+        tzDiff -= 3600;
+    }
+
+    jdn += tzDiff*1000; // tzDiff is in seconds
+
     m_time.Assign(jdn);
 
     return *this;
@@ -1904,8 +1915,8 @@ wxDateTime& wxDateTime::SetToYearDay(wxDateTime::wxDateTime_t yday)
 
 double wxDateTime::GetJulianDayNumber() const
 {
-    // JDN are always expressed for the GMT dates
-    Tm tm(ToTimezone(GMT0).GetTm(GMT0));
+    // JDN are always expressed for the UTC dates
+    Tm tm(ToTimezone(UTC).GetTm(UTC));
 
     double result = GetTruncatedJDN(tm.mday, tm.mon, tm.year);