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 193d7d1f399cf0a840b656664b83018ddfb77364..29dd5170a9898bf09f017db13bcce152621d690c 100644 (file)
--- a/tests/any/anytest.cpp
+++ b/tests/any/anytest.cpp
@@ -37,15 +37,10 @@ private:
         CPPUNIT_TEST( Equality );
         CPPUNIT_TEST( As );
         CPPUNIT_TEST( GetAs );
         CPPUNIT_TEST( Equality );
         CPPUNIT_TEST( As );
         CPPUNIT_TEST( GetAs );

-        // FIXME: One of these tests might result in heap corruption under PPC
-        //        OS X, disable them to at least allow the subsequent tests to
-        //        run as otherwise the test program just crashes.
-#ifndef __WXOSX__

         CPPUNIT_TEST( Null );
         CPPUNIT_TEST( wxVariantConversions );
         CPPUNIT_TEST( CustomTemplateSpecialization );
         CPPUNIT_TEST( Misc );
         CPPUNIT_TEST( Null );
         CPPUNIT_TEST( wxVariantConversions );
         CPPUNIT_TEST( CustomTemplateSpecialization );
         CPPUNIT_TEST( Misc );

-#endif // __WXOSX__

     CPPUNIT_TEST_SUITE_END();
 
     void CheckType();
     CPPUNIT_TEST_SUITE_END();
 
     void CheckType();


@@ -408,7 +403,7 @@ void wxAnyTestCase::GetAs()
     res = m_anyDoubleDouble1.GetAs(&s);
     CPPUNIT_ASSERT(res);
     double d2;
     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);
 }
     CPPUNIT_ASSERT(res);
     CPPUNIT_ASSERT_DOUBLES_EQUAL(d2, TEST_FLOAT_CONST, FEQ_DELTA);
 }