fixed wxBase compilation (what was msgdlg.h doing in wxchar.cpp?)

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

diff --git a/src/common/hash.cpp b/src/common/hash.cpp
index d8079dce9eef6fc20e662e06301ff2e5d6c388bc..f8e5ec096b05c4bc64d14245ad50af7671c30678 100644 (file)
--- a/src/common/hash.cpp
+++ b/src/common/hash.cpp
@@ -310,6 +310,30 @@ wxString wxStringHashTable::Get(long key, bool *wasFound) const
     return _T("");
 }
 
     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;
+}
+

 // ----------------------------------------------------------------------------
 // old not type safe wxHashTable
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // old not type safe wxHashTable
 // ----------------------------------------------------------------------------


@@ -370,6 +394,7 @@ bool wxHashTable::Create(int the_key_type, int size)
 void wxHashTable::DoCopy(const wxHashTable& table)
 {
   n = table.n;
 void wxHashTable::DoCopy(const wxHashTable& table)
 {
   n = table.n;

+  m_count = table.m_count;

   current_position = table.current_position;
   current_node = NULL; // doesn't matter - Next() will reconstruct it
   key_type = table.key_type;
   current_position = table.current_position;
   current_node = NULL; // doesn't matter - Next() will reconstruct it
   key_type = table.key_type;


@@ -413,7 +438,7 @@ void wxHashTable::Put (long key, const wxChar *value, wxObject * object)
 
   if (!hash_table[position])
   {
 
   if (!hash_table[position])
   {

-    hash_table[position] = new wxList (wxKEY_INTEGER);
+    hash_table[position] = new wxList (wxKEY_STRING);

     if (m_deleteContents) hash_table[position]->DeleteContents(TRUE);
   }
 
     if (m_deleteContents) hash_table[position]->DeleteContents(TRUE);
   }
 


@@ -681,11 +706,14 @@ void wxHashTable::DeleteContents (bool flag)
 
 void wxHashTable::Clear ()
 {
 
 void wxHashTable::Clear ()
 {

-  int i;
-  for (i = 0; i < n; i++)
+    int i;
+    if (hash_table)

     {
     {

-      if (hash_table[i])
-        hash_table[i]->Clear ();
+        for (i = 0; i < n; i++)
+        {
+            if (hash_table[i])
+                hash_table[i]->Clear ();
+        }

     }
   m_count = 0;
 }
     }
   m_count = 0;
 }