Use wxFindWindowAtPoint() for hit testing in wxPopupTransientWindow.

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

diff --git a/tests/any/anytest.cpp b/tests/any/anytest.cpp
index 156ba086899a78885cc707d117b45848cffbe684..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
 ///////////////////////////////////////////////////////////////////////////////


@@ -101,7 +100,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,


@@ -403,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);
 }


@@ -563,7 +562,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 +730,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