VC 7.1 warning fix

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

diff --git a/src/common/hash.cpp b/src/common/hash.cpp
index 1c268e7c97c6c1897933073d8873ee00fbc8c9ef..1df6c30b78246c310426b7ade4065cb34300b014 100644 (file)
--- a/src/common/hash.cpp
+++ b/src/common/hash.cpp
@@ -5,7 +5,7 @@
 // Modified by: VZ at 25.02.00: type safe hashes with WX_DECLARE_HASH()
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -34,6 +34,8 @@
 
 #include "wx/hash.h"
 
+#if !wxUSE_STL
+
 #include <string.h>
 #include <stdarg.h>
 
@@ -119,6 +121,8 @@ wxNodeBase *wxHashTableBase::GetNode(long key, long value) const
     return node;
 }
 
+#if WXWIN_COMPATIBILITY_2_4
+
 // ----------------------------------------------------------------------------
 // wxHashTableLong
 // ----------------------------------------------------------------------------
@@ -310,6 +314,32 @@ wxString wxStringHashTable::Get(long key, bool *wasFound) const
     return _T("");
 }
 
+bool wxStringHashTable::Delete(long key) const
+{
+    wxCHECK_MSG( m_hashSize, FALSE, _T("must call Create() first") );
+
+    size_t slot = (size_t)abs((int)(key % (long)m_hashSize));
+
+    wxArrayLong *keys = m_keys[slot];
+    if ( keys )
+    {
+        size_t count = keys->GetCount();
+        for ( size_t n = 0; n < count; n++ )
+        {
+            if ( keys->Item(n) == key )
+            {
+                keys->RemoveAt(n);
+                m_values[slot]->RemoveAt(n);
+                return TRUE;
+            }
+        }
+    }
+
+    return FALSE;
+}
+
+#endif // WXWIN_COMPATIBILITY_2_4
+
 // ----------------------------------------------------------------------------
 // old not type safe wxHashTable
 // ----------------------------------------------------------------------------
@@ -469,7 +499,7 @@ wxObject *wxHashTable::Get (long key, long value) const
     {
       wxNode *node = hash_table[position]->Find (value);
       if (node)
-        return node->Data ();
+        return node->GetData ();
       else
         return (wxObject *) NULL;
     }
@@ -489,7 +519,7 @@ wxObject *wxHashTable::Get (long key, const wxChar *value) const
     {
       wxNode *node = hash_table[position]->Find (value);
       if (node)
-        return node->Data ();
+        return node->GetData ();
       else
         return (wxObject *) NULL;
     }
@@ -508,7 +538,7 @@ wxObject *wxHashTable::Get (long key) const
   else
     {
       wxNode *node = hash_table[position]->Find (k);
-      return node ? node->Data () : (wxObject*)NULL;
+      return node ? node->GetData () : (wxObject*)NULL;
     }
 }
 
@@ -522,7 +552,7 @@ wxObject *wxHashTable::Get (const wxChar *key) const
   else
     {
       wxNode *node = hash_table[position]->Find (key);
-      return node ? node->Data () : (wxObject*)NULL;
+      return node ? node->GetData () : (wxObject*)NULL;
     }
 }
 
@@ -541,7 +571,7 @@ wxObject *wxHashTable::Delete (long key)
       wxNode *node = hash_table[position]->Find (k);
       if (node)
         {
-          wxObject *data = node->Data ();
+          wxObject *data = node->GetData ();
           delete node;
           m_count--;
           return data;
@@ -563,7 +593,7 @@ wxObject *wxHashTable::Delete (const wxChar *key)
       wxNode *node = hash_table[position]->Find (key);
       if (node)
         {
-          wxObject *data = node->Data ();
+          wxObject *data = node->GetData ();
           delete node;
           m_count--;
           return data;
@@ -588,7 +618,7 @@ wxObject *wxHashTable::Delete (long key, int value)
       wxNode *node = hash_table[position]->Find (value);
       if (node)
         {
-          wxObject *data = node->Data ();
+          wxObject *data = node->GetData ();
           delete node;
           m_count--;
           return data;
@@ -610,7 +640,7 @@ wxObject *wxHashTable::Delete (long key, const wxChar *value)
       wxNode *node = hash_table[position]->Find (value);
       if (node)
         {
-          wxObject *data = node->Data ();
+          wxObject *data = node->GetData ();
           delete node;
           m_count--;
           return data;
@@ -655,14 +685,14 @@ wxNode *wxHashTable::Next ()
             {
               if (hash_table[current_position])
                 {
-                  current_node = hash_table[current_position]->First ();
+                  current_node = hash_table[current_position]->GetFirst ();
                   found = current_node;
                 }
             }
         }
       else
         {
-          current_node = current_node->Next ();
+          current_node = current_node->GetNext ();
           found = current_node;
         }
     }
@@ -694,3 +724,4 @@ void wxHashTable::Clear ()
   m_count = 0;
 }
 
+#endif // !wxUSE_STL