corrected preproc condition

[wxWidgets.git] / src / common / hash.cpp

diff --git a/src/common/hash.cpp b/src/common/hash.cpp
index d2a71fa8d31d35bda0606aeb2ef36f3b12d0c739..28ba8276dad35db2462f34f4bc87dbb7d7b0c608 100644 (file)
--- a/src/common/hash.cpp
+++ b/src/common/hash.cpp
@@ -34,7 +34,7 @@
 
 #include "wx/hash.h"
 
-#if !wxUSE_STL
+#if wxUSE_OLD_HASH_TABLE
 
 #include <string.h>
 #include <stdarg.h>
@@ -724,9 +724,7 @@ void wxHashTable::Clear ()
   m_count = 0;
 }
 
-#else // if wxUSE_STL
-
-#include "wx/object.h"
+#else // if !wxUSE_OLD_HASH_TABLE
 
 wxHashTableBase_Node::wxHashTableBase_Node( long key, void* value,
                                             wxHashTableBase* table )
@@ -755,11 +753,6 @@ wxHashTableBase::wxHashTableBase()
 {
 }
 
-wxHashTableBase::~wxHashTableBase()
-{
-    Destroy();
-}
-
 void wxHashTableBase::Create( wxKeyType keyType, size_t size )
 {
     m_keyType = keyType;
@@ -1040,7 +1033,7 @@ const wxHashTable& wxHashTable::operator=( const wxHashTable& table )
     return *this;
 }
 
-void wxHashTable::DoCopy( const wxHashTable& table )
+void wxHashTable::DoCopy( const wxHashTable& WXUNUSED(table) )
 {
     Create( m_keyType, m_size );
 
@@ -1083,4 +1076,4 @@ wxHashTable::Node* wxHashTable::Next()
     return m_curr;
 }
 
-#endif // wxUSE_STL
+#endif // !wxUSE_OLD_HASH_TABLE