Improve drawing of the tree item buttons in the generic renderer.

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

diff --git a/tests/any/anytest.cpp b/tests/any/anytest.cpp
index c746c30e5b05637e6aebeaabc44a6c8ed2b0591d..2b36e3bb38ddcb94cfe50f5a70ce270990aa2005 100644 (file)
--- 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
 // Name:        tests/any/anytest.cpp
 // Purpose:     Test the wxAny classes
 // Author:      Jaakko Salli

-// RCS-ID:      $Id$

 // Copyright:   (c) the wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) the wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -313,17 +312,10 @@ void wxAnyTestCase::GetAs()
     short int si = 0;
     unsigned long ul = 0;
     wxString s;
     short int si = 0;
     unsigned long ul = 0;
     wxString s;

-#if defined(__POWERPC__)
-    // FIXME: under wxOSX using float instead of double results in the heap
-    //        corruption, at least in the builds under PPC architecture for
-    //        some reason, disable them temporarily until this can be found.
-    double f = 0.0;
-#else

     // Let's test against float instead of double, since the former
     // is not the native underlying type the code converts to, but
     // should still work, all the same.
     float f = 0.0;
     // Let's test against float instead of double, since the former
     // is not the native underlying type the code converts to, but
     // should still work, all the same.
     float f = 0.0;

-#endif

     bool b = false;
 
     // Conversions from signed long type
     bool b = false;
 
     // Conversions from signed long type


@@ -410,7 +402,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);
 }