]> git.saurik.com Git - wxWidgets.git/blobdiff - tests/datetime/datetimetest.cpp
fixing unicode compile
[wxWidgets.git] / tests / datetime / datetimetest.cpp
index db64b5c53ecb8dbf900b40a7405d776bd0837aeb..8caa1e71c42495b5170c9bdf45fed509f9834608 100644 (file)
@@ -639,7 +639,7 @@ void DateTimeTestCase::TestTimeFormat()
 
             // convert back
             wxDateTime dt2;
-            const wxChar *result = dt2.ParseFormat(s, fmt);
+            const wxChar *result = dt2.ParseFormat(s.c_str(), fmt);
             if ( !result )
             {
                 // converion failed - should it have?
@@ -854,11 +854,11 @@ void DateTimeTestCase::TestDSTBug()
 {
     /////////////////////////
     // Test GetEndDST()
-    wxDateTime dt = wxDateTime::GetEndDST(2004);
+    wxDateTime dt = wxDateTime::GetEndDST(2004, wxDateTime::France);
     CPPUNIT_ASSERT_EQUAL(31, (int)dt.GetDay());
     CPPUNIT_ASSERT_EQUAL(wxDateTime::Oct, dt.GetMonth());
     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.GetSecond());
     CPPUNIT_ASSERT_EQUAL(0, (int)dt.GetMillisecond());