define wxHAS_RAW_BITMAP (instead of inconsistenly named wxHAVE_RAW_BITMAP) and use...

[wxWidgets.git] / tests / hashes / hashes.cpp

diff --git a/tests/hashes/hashes.cpp b/tests/hashes/hashes.cpp
index 229703f9c5b209885d25e0bd0c9792d8eae35b90..e2a0f6bb3b410d9321f519a5fa5dba510bfae7a9 100644 (file)
--- a/tests/hashes/hashes.cpp
+++ b/tests/hashes/hashes.cpp
@@ -264,17 +264,8 @@ void HashesTestCase::wxUntypedHashTableDeleteContents()
     CPPUNIT_ASSERT( FooObject::count == 0 );
 }
 
-#if WXWIN_COMPATIBILITY_2_4
-WX_DECLARE_LIST(Foo, wxListFoos);
-#endif
-
 WX_DECLARE_HASH(Foo, wxListFoos, wxHashFoos);
 
-#if WXWIN_COMPATIBILITY_2_4
-#include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxListFoos);
-#endif
-
 void HashesTestCase::wxTypedHashTableTest()
 {
     // need a nested scope for destruction
@@ -482,6 +473,12 @@ void HashesTestCase::LLongHashMapTest()  { HashMapTest<myLLongHashMap>();    }
 void HashesTestCase::ULLongHashMapTest() { HashMapTest<myULLongHashMap>();   }
 #endif
 
+#ifdef __VISUALC__
+    #if __VISUALC__ <= 1200
+        #pragma warning(disable:4284) // operator->() returns a non-UDT
+    #endif
+#endif // __VISUALC__
+
 // test compilation of basic set types
 WX_DECLARE_HASH_SET( int*, wxPointerHash, wxPointerEqual, myPtrHashSet );
 WX_DECLARE_HASH_SET( long, wxIntegerHash, wxIntegerEqual, myLongHashSet );