Fixed wxAny tests for VC6

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/tests/any/anytest.cpp b/tests/any/anytest.cpp
index 4b056916449cdcd787255be28dce1b28598fdf7b..5e6252b49ed86e1e0ecfc1bdc2978aaf27c87108 100644 (file)
--- a/tests/any/anytest.cpp
+++ b/tests/any/anytest.cpp
@@ -181,8 +181,9 @@ void wxAnyTestCase::Equality()
     CPPUNIT_ASSERT_DOUBLES_EQUAL(wxANY_AS(m_anyFloatDouble1, double),\r
                                  TEST_FLOAT_CONST,\r
                                  FEQ_DELTA);\r
-    CPPUNIT_ASSERT(m_anyWxObjectPtr1.As<wxObject*>() == dummyWxObjectPointer);\r
-    CPPUNIT_ASSERT(m_anyVoidPtr1.As<void*>() == dummyVoidPointer);\r
+    CPPUNIT_ASSERT(wxANY_AS(m_anyWxObjectPtr1, wxObject*)\r
+                        == dummyWxObjectPointer);\r
+    CPPUNIT_ASSERT(wxANY_AS(m_anyVoidPtr1, void*) == dummyVoidPointer);\r
 \r
     CPPUNIT_ASSERT(m_anySignedLong2 == 15);\r
     CPPUNIT_ASSERT(m_anyStringString2 == wxString("abc"));\r
@@ -195,8 +196,9 @@ void wxAnyTestCase::Equality()
     CPPUNIT_ASSERT_DOUBLES_EQUAL(wxANY_AS(m_anyFloatDouble2, double),\r
                                  TEST_FLOAT_CONST,\r
                                  FEQ_DELTA);\r
-    CPPUNIT_ASSERT(m_anyWxObjectPtr2.As<wxObject*>() == dummyWxObjectPointer);\r
-    CPPUNIT_ASSERT(m_anyVoidPtr2.As<void*>() == dummyVoidPointer);\r
+    CPPUNIT_ASSERT(wxANY_AS(m_anyWxObjectPtr2, wxObject*)\r
+                        == dummyWxObjectPointer);\r
+    CPPUNIT_ASSERT(wxANY_AS(m_anyVoidPtr2, void*) == dummyVoidPointer);\r
 }\r
 \r
 void wxAnyTestCase::As()\r