Convert wxFSW_EVENT_{WARNING,ERROR} to string correctly.

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

diff --git a/tests/any/anytest.cpp b/tests/any/anytest.cpp
index 156ba086899a78885cc707d117b45848cffbe684..7c6fdaa131cd9b31d71baf4faefd3c1b8488ebb4 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 );
 
 // 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,
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( wxAnyTestCase, "wxAnyTestCase" );
 
 // Let's use a number with first digit after decimal dot less than 5,


@@ -563,7 +563,9 @@ void wxAnyTestCase::wxVariantConversions()
     res = any.GetAs(&variant);
     CPPUNIT_ASSERT(res);
     CPPUNIT_ASSERT(variant.GetType() == "string");
     res = any.GetAs(&variant);
     CPPUNIT_ASSERT(res);
     CPPUNIT_ASSERT(variant.GetType() == "string");

+#if wxUSE_UNICODE

     CPPUNIT_ASSERT(variant.GetString() == L"ABC");
     CPPUNIT_ASSERT(variant.GetString() == L"ABC");

+#endif

 
     any = vDouble;
     double d = wxANY_AS(any, double);
 
     any = vDouble;
     double d = wxANY_AS(any, double);


@@ -729,7 +731,7 @@ void wxAnyTestCase::Misc()
         }
 
         wxAny any2 = any;
         }
 
         wxAny any2 = any;

-        CPPUNIT_ASSERT( any2.As<MyClass>().GetValue() == 15 );
+        CPPUNIT_ASSERT( wxANY_AS(any2, MyClass).GetValue() == 15 );

     }
 
     // Make sure allocations and deallocations match
     }
 
     // Make sure allocations and deallocations match