using ordinary Show for popup windows as on MSW which activates it as well, I'll...

[wxWidgets.git] / tests / any / anytest.cpp

diff --git a/tests/any/anytest.cpp b/tests/any/anytest.cpp
index 36109d5c98173a760a00960511ac2080e5e508e5..29dd5170a9898bf09f017db13bcce152621d690c 100644 (file)
--- a/tests/any/anytest.cpp
+++ b/tests/any/anytest.cpp
@@ -101,7 +101,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 +403,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 +563,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);