X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/debe6624c1e9d4bf3243381153d1e173c849bcd8..e8f4c5840691b5e27543c5e31a410606b0a4cc6c:/src/common/hash.cpp?ds=sidebyside

diff --git a/src/common/hash.cpp b/src/common/hash.cpp
index 3ba92c80ca..3c514d498c 100644
--- a/src/common/hash.cpp
+++ b/src/common/hash.cpp
@@ -29,48 +29,77 @@
 #include <string.h>
 #include <stdarg.h>
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxHashTable, wxObject)
-#endif
 
 wxHashTable::wxHashTable (int the_key_type, int size)
 {
+  n = 0;
+  hash_table = (wxList**) NULL;
+  Create(the_key_type, size);
+/*
   n = size;
   current_position = -1;
-  current_node = NULL;
+  current_node = (wxNode *) NULL;
 
   key_type = the_key_type;
   hash_table = new wxList *[size];
   int i;
   for (i = 0; i < size; i++)
-    hash_table[i] = NULL;
+    hash_table[i] = (wxList *) NULL;
+*/
 }
 
 wxHashTable::~wxHashTable (void)
 {
+  Destroy();
+}
+
+void wxHashTable::Destroy(void)
+{
+  if (!hash_table) return;
   int i;
   for (i = 0; i < n; i++)
     if (hash_table[i])
       delete hash_table[i];
   delete[] hash_table;
+  hash_table = NULL;
 }
 
 bool wxHashTable::Create(int the_key_type, int size)
 {
+  Destroy();
+
   n = size;
   current_position = -1;
-  current_node = NULL;
+  current_node = (wxNode *) NULL;
 
   key_type = the_key_type;
-  if (hash_table)
-    delete[] hash_table;
   hash_table = new wxList *[size];
   int i;
   for (i = 0; i < size; i++)
-    hash_table[i] = NULL;
+    hash_table[i] = (wxList *) NULL;
   return TRUE;
 }
 
+
+void wxHashTable::DoCopy(const wxHashTable& table)
+{
+  n = table.n;
+  current_position = table.current_position;
+  current_node = NULL; // doesn't matter - Next() will reconstruct it
+  key_type = table.key_type;
+
+  hash_table = new wxList *[n];
+  for (int i = 0; i < n; i++) {
+    if (table.hash_table[i] == NULL)
+      hash_table[i] = NULL;
+    else {
+      hash_table[i] = new wxList(key_type);
+      *(hash_table[i]) = *(table.hash_table[i]);
+    }
+  }
+}
+
 void wxHashTable::Put (long key, long value, wxObject * object)
 {
   // Should NEVER be
@@ -85,7 +114,7 @@ void wxHashTable::Put (long key, long value, wxObject * object)
   hash_table[position]->Append (value, object);
 }
 
-void wxHashTable::Put (long key, const char *value, wxObject * object)
+void wxHashTable::Put (long key, const wxChar *value, wxObject * object)
 {
   // Should NEVER be
   long k = (long) key;
@@ -113,7 +142,7 @@ void wxHashTable::Put (long key, wxObject * object)
   hash_table[position]->Append (k, object);
 }
 
-void wxHashTable::Put (const char *key, wxObject * object)
+void wxHashTable::Put (const wxChar *key, wxObject * object)
 {
   int position = (int) (MakeKey (key) % n);
 
@@ -132,18 +161,18 @@ wxObject *wxHashTable::Get (long key, long value) const
 
   int position = (int) (k % n);
   if (!hash_table[position])
-    return NULL;
+    return (wxObject *) NULL;
   else
     {
       wxNode *node = hash_table[position]->Find (value);
       if (node)
 	return node->Data ();
       else
-	return NULL;
+	return (wxObject *) NULL;
     }
 }
 
-wxObject *wxHashTable::Get (long key, const char *value) const
+wxObject *wxHashTable::Get (long key, const wxChar *value) const
 {
   // Should NEVER be
   long k = (long) key;
@@ -152,14 +181,14 @@ wxObject *wxHashTable::Get (long key, const char *value) const
 
   int position = (int) (k % n);
   if (!hash_table[position])
-    return NULL;
+    return (wxObject *) NULL;
   else
     {
       wxNode *node = hash_table[position]->Find (value);
       if (node)
 	return node->Data ();
       else
-	return NULL;
+	return (wxObject *) NULL;
     }
 }
 
@@ -172,7 +201,7 @@ wxObject *wxHashTable::Get (long key) const
 
   int position = (int) (k % n);
   if (!hash_table[position])
-    return NULL;
+    return (wxObject *) NULL;
   else
     {
       wxNode *node = hash_table[position]->Find (k);
@@ -180,12 +209,12 @@ wxObject *wxHashTable::Get (long key) const
     }
 }
 
-wxObject *wxHashTable::Get (const char *key) const
+wxObject *wxHashTable::Get (const wxChar *key) const
 {
   int position = (int) (MakeKey (key) % n);
 
   if (!hash_table[position])
-    return NULL;
+    return (wxObject *) NULL;
   else
     {
       wxNode *node = hash_table[position]->Find (key);
@@ -202,7 +231,7 @@ wxObject *wxHashTable::Delete (long key)
 
   int position = (int) (k % n);
   if (!hash_table[position])
-    return NULL;
+    return (wxObject *) NULL;
   else
     {
       wxNode *node = hash_table[position]->Find (k);
@@ -213,15 +242,15 @@ wxObject *wxHashTable::Delete (long key)
 	  return data;
 	}
       else
-	return NULL;
+	return (wxObject *) NULL;
     }
 }
 
-wxObject *wxHashTable::Delete (const char *key)
+wxObject *wxHashTable::Delete (const wxChar *key)
 {
   int position = (int) (MakeKey (key) % n);
   if (!hash_table[position])
-    return NULL;
+    return (wxObject *) NULL;
   else
     {
       wxNode *node = hash_table[position]->Find (key);
@@ -232,7 +261,7 @@ wxObject *wxHashTable::Delete (const char *key)
 	  return data;
 	}
       else
-	return NULL;
+	return (wxObject *) NULL;
     }
 }
 
@@ -245,7 +274,7 @@ wxObject *wxHashTable::Delete (long key, int value)
 
   int position = (int) (k % n);
   if (!hash_table[position])
-    return NULL;
+    return (wxObject *) NULL;
   else
     {
       wxNode *node = hash_table[position]->Find (value);
@@ -256,15 +285,15 @@ wxObject *wxHashTable::Delete (long key, int value)
 	  return data;
 	}
       else
-	return NULL;
+	return (wxObject *) NULL;
     }
 }
 
-wxObject *wxHashTable::Delete (long key, const char *value)
+wxObject *wxHashTable::Delete (long key, const wxChar *value)
 {
   int position = (int) (key % n);
   if (!hash_table[position])
-    return NULL;
+    return (wxObject *) NULL;
   else
     {
       wxNode *node = hash_table[position]->Find (value);
@@ -275,16 +304,16 @@ wxObject *wxHashTable::Delete (long key, const char *value)
 	  return data;
 	}
       else
-	return NULL;
+	return (wxObject *) NULL;
     }
 }
 
-long wxHashTable::MakeKey (const char *string) const
+long wxHashTable::MakeKey (const wxChar *string) const
 {
   long int_key = 0;
 
   while (*string)
-    int_key += (unsigned char) *string++;
+    int_key += (wxUChar) *string++;
 
   return int_key;
 }
@@ -292,12 +321,12 @@ long wxHashTable::MakeKey (const char *string) const
 void wxHashTable::BeginFind (void)
 {
   current_position = -1;
-  current_node = NULL;
+  current_node = (wxNode *) NULL;
 }
 
 wxNode *wxHashTable::Next (void)
 {
-  wxNode *found = NULL;
+  wxNode *found = (wxNode *) NULL;
   bool end = FALSE;
   while (!end && !found)
     {
@@ -307,7 +336,7 @@ wxNode *wxHashTable::Next (void)
 	  if (current_position >= n)
 	    {
 	      current_position = -1;
-	      current_node = NULL;
+	      current_node = (wxNode *) NULL;
 	      end = TRUE;
 	    }
 	  else