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

return the beginning/end of DST in local time, not UTC, for consistency with the other methods; fixed the test

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48997 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-09-30 19:27:23 +00:00
parent 8888d9710f
commit 770882a69e
2 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/datetime.cpp
View File

@@ -1231,9 +1231,6 @@ wxDateTime wxDateTime::GetBeginDST(int year, Country country)
} }
dt += wxTimeSpan::Hours(1); dt += wxTimeSpan::Hours(1);
// disable DST tests because it could result in an infinite recursion!
dt.MakeGMT(true);
} }
else switch ( country ) else switch ( country )
{ {
@@ -1332,9 +1329,6 @@ wxDateTime wxDateTime::GetEndDST(int year, Country country)
} }
dt += wxTimeSpan::Hours(1); dt += wxTimeSpan::Hours(1);
// disable DST tests because it could result in an infinite recursion!
dt.MakeGMT(true);
} }
else switch ( country ) else switch ( country )
{ {

2
tests/datetime/datetimetest.cpp
View File

@@ -858,7 +858,7 @@ void DateTimeTestCase::TestDSTBug()
CPPUNIT_ASSERT_EQUAL(31, (int)dt.GetDay()); CPPUNIT_ASSERT_EQUAL(31, (int)dt.GetDay());
CPPUNIT_ASSERT_EQUAL(wxDateTime::Oct, dt.GetMonth()); CPPUNIT_ASSERT_EQUAL(wxDateTime::Oct, dt.GetMonth());
CPPUNIT_ASSERT_EQUAL(2004, (int)dt.GetYear()); CPPUNIT_ASSERT_EQUAL(2004, (int)dt.GetYear());
CPPUNIT_ASSERT_EQUAL(2, (int)dt.GetHour()); CPPUNIT_ASSERT_EQUAL(1, (int)dt.GetHour());
CPPUNIT_ASSERT_EQUAL(0, (int)dt.GetMinute()); CPPUNIT_ASSERT_EQUAL(0, (int)dt.GetMinute());
CPPUNIT_ASSERT_EQUAL(0, (int)dt.GetSecond()); CPPUNIT_ASSERT_EQUAL(0, (int)dt.GetSecond());
CPPUNIT_ASSERT_EQUAL(0, (int)dt.GetMillisecond()); CPPUNIT_ASSERT_EQUAL(0, (int)dt.GetMillisecond());