X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7c2257892c99696cc2f2489b3e51bcbc24597abb..5f9e369af0c834bbde0f7f5d2047abd736967f58:/tests/any/anytest.cpp diff --git a/tests/any/anytest.cpp b/tests/any/anytest.cpp index 36109d5c98..2b36e3bb38 100644 --- a/tests/any/anytest.cpp +++ b/tests/any/anytest.cpp @@ -2,7 +2,6 @@ // Name: tests/any/anytest.cpp // Purpose: Test the wxAny classes // Author: Jaakko Salli -// RCS-ID: $Id$ // Copyright: (c) the wxWidgets team // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -101,7 +100,7 @@ private: // register in the unnamed registry so that these tests are run by default CPPUNIT_TEST_SUITE_REGISTRATION( wxAnyTestCase ); -// also include in it's own registry so that these tests can be run alone +// also include in its own registry so that these tests can be run alone CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( wxAnyTestCase, "wxAnyTestCase" ); // Let's use a number with first digit after decimal dot less than 5, @@ -403,7 +402,7 @@ void wxAnyTestCase::GetAs() res = m_anyDoubleDouble1.GetAs(&s); CPPUNIT_ASSERT(res); double d2; - res = s.ToDouble(&d2); + res = s.ToCDouble(&d2); CPPUNIT_ASSERT(res); CPPUNIT_ASSERT_DOUBLES_EQUAL(d2, TEST_FLOAT_CONST, FEQ_DELTA); } @@ -563,7 +562,9 @@ void wxAnyTestCase::wxVariantConversions() res = any.GetAs(&variant); CPPUNIT_ASSERT(res); CPPUNIT_ASSERT(variant.GetType() == "string"); +#if wxUSE_UNICODE CPPUNIT_ASSERT(variant.GetString() == L"ABC"); +#endif any = vDouble; double d = wxANY_AS(any, double);