removing the IsWindow() test in ~wxWindow

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

diff --git a/src/common/hash.cpp b/src/common/hash.cpp
index f4139dd5f9d7beadf69ad7de653a1d401e1fc6e3..ef635a1be112b881c49fad644e7a0c150584b994 100644 (file)
--- a/src/common/hash.cpp
+++ b/src/common/hash.cpp
@@ -2,13 +2,21 @@
 // Name:        hash.cpp
 // Purpose:     wxHashTable implementation
 // Author:      Julian Smart
 // Name:        hash.cpp
 // Purpose:     wxHashTable implementation
 // Author:      Julian Smart

-// Modified by:
+// 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
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+

 #ifdef __GNUG__
 #pragma implementation "hash.h"
 #endif
 #ifdef __GNUG__
 #pragma implementation "hash.h"
 #endif


@@ -29,12 +37,100 @@
 #include <string.h>
 #include <stdarg.h>
 
 #include <string.h>
 #include <stdarg.h>
 

-#if !USE_SHARED_LIBRARY
+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------
+

 IMPLEMENT_DYNAMIC_CLASS(wxHashTable, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxHashTable, wxObject)

-#endif
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxHashTablleBase for working with "void *" data
+// ----------------------------------------------------------------------------
+
+wxHashTableBase::wxHashTableBase()
+{
+    m_deleteContents = FALSE;
+    m_hashTable = (wxListBase **)NULL;
+    m_hashSize = 0;
+    m_count = 0;
+    m_keyType = wxKEY_NONE;
+}
+
+void wxHashTableBase::Create(wxKeyType keyType, size_t size)
+{
+    Destroy();
+
+    m_hashSize = size;
+    m_keyType = keyType;
+    m_hashTable = new wxListBase *[size];
+    for ( size_t n = 0; n < m_hashSize; n++ )
+    {
+        m_hashTable[n] = (wxListBase *) NULL;
+    }
+}
+
+void wxHashTableBase::Destroy()
+{
+    if ( m_hashTable )
+    {
+        for ( size_t n = 0; n < m_hashSize; n++ )
+        {
+            delete m_hashTable[n];
+        }
+
+        delete [] m_hashTable;
+
+        m_hashTable = (wxListBase **)NULL;
+
+        m_count = 0;
+    }
+}
+
+void wxHashTableBase::DeleteContents(bool flag)
+{
+    m_deleteContents = flag;
+    for ( size_t n = 0; n < m_hashSize; n++ )
+    {
+        if ( m_hashTable[n] )
+        {
+            m_hashTable[n]->DeleteContents(flag);
+        }
+    }
+}
+
+wxNodeBase *wxHashTableBase::GetNode(long key, long value) const
+{
+    size_t slot = (size_t)abs(key % m_hashSize);
+
+    wxNodeBase *node;
+    if ( m_hashTable[slot] )
+    {
+        node = m_hashTable[slot]->Find(wxListKey(value));
+    }
+    else
+    {
+        node = (wxNodeBase *)NULL;
+    }
+
+    return node;
+}
+
+// ----------------------------------------------------------------------------
+// old not type safe wxHashTable
+// ----------------------------------------------------------------------------

 
 wxHashTable::wxHashTable (int the_key_type, int size)
 {
 
 wxHashTable::wxHashTable (int the_key_type, int size)
 {

+  n = 0;
+  hash_table = (wxList**) NULL;
+  Create(the_key_type, size);
+  m_count = 0;
+  m_deleteContents = FALSE;
+/*

   n = size;
   current_position = -1;
   current_node = (wxNode *) NULL;
   n = size;
   current_position = -1;
   current_node = (wxNode *) NULL;


@@ -44,26 +140,34 @@ wxHashTable::wxHashTable (int the_key_type, int size)
   int i;
   for (i = 0; i < size; i++)
     hash_table[i] = (wxList *) NULL;
   int i;
   for (i = 0; i < size; i++)
     hash_table[i] = (wxList *) NULL;

+*/

 }
 
 }
 

-wxHashTable::~wxHashTable (void)
+wxHashTable::~wxHashTable ()

 {
 {

+  Destroy();
+}
+
+void wxHashTable::Destroy()
+{
+  if (!hash_table) return;

   int i;
   for (i = 0; i < n; i++)
     if (hash_table[i])
       delete hash_table[i];
   delete[] hash_table;
   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)
 {
 }
 
 bool wxHashTable::Create(int the_key_type, int size)
 {

+  Destroy();
+

   n = size;
   current_position = -1;
   current_node = (wxNode *) NULL;
 
   key_type = the_key_type;
   n = size;
   current_position = -1;
   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 = new wxList *[size];
   int i;
   for (i = 0; i < size; i++)


@@ -71,95 +175,131 @@ bool wxHashTable::Create(int the_key_type, int size)
   return TRUE;
 }
 
   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
   long k = (long) key;
 void wxHashTable::Put (long key, long value, wxObject * object)
 {
   // Should NEVER be
   long k = (long) key;

-  if (k < 0)
-    k = -k;

 
   int position = (int) (k % n);
 
   int position = (int) (k % n);

+  if (position < 0) position = -position;
+

   if (!hash_table[position])
   if (!hash_table[position])

+  {

     hash_table[position] = new wxList (wxKEY_INTEGER);
     hash_table[position] = new wxList (wxKEY_INTEGER);

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

 
   hash_table[position]->Append (value, object);
 
   hash_table[position]->Append (value, object);

+  m_count++;

 }
 
 }
 

-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;
 {
   // Should NEVER be
   long k = (long) key;

-  if (k < 0)
-    k = -k;

 
   int position = (int) (k % n);
 
   int position = (int) (k % n);

+  if (position < 0) position = -position;
+

   if (!hash_table[position])
   if (!hash_table[position])

+  {

     hash_table[position] = new wxList (wxKEY_INTEGER);
     hash_table[position] = new wxList (wxKEY_INTEGER);

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

 
   hash_table[position]->Append (value, object);
 
   hash_table[position]->Append (value, object);

+  m_count++;

 }
 
 void wxHashTable::Put (long key, wxObject * object)
 {
   // Should NEVER be
   long k = (long) key;
 }
 
 void wxHashTable::Put (long key, wxObject * object)
 {
   // Should NEVER be
   long k = (long) key;

-  if (k < 0)
-    k = -k;

 
   int position = (int) (k % n);
 
   int position = (int) (k % n);

+  if (position < 0) position = -position;
+

   if (!hash_table[position])
   if (!hash_table[position])

+  {

     hash_table[position] = new wxList (wxKEY_INTEGER);
     hash_table[position] = new wxList (wxKEY_INTEGER);

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

 
   hash_table[position]->Append (k, object);
 
   hash_table[position]->Append (k, object);

+  m_count++;

 }
 
 }
 

-void wxHashTable::Put (const char *key, wxObject * object)
+void wxHashTable::Put (const wxChar *key, wxObject * object)

 {
   int position = (int) (MakeKey (key) % n);
 {
   int position = (int) (MakeKey (key) % n);

+  if (position < 0) position = -position;

 
   if (!hash_table[position])
 
   if (!hash_table[position])

+  {

     hash_table[position] = new wxList (wxKEY_STRING);
     hash_table[position] = new wxList (wxKEY_STRING);

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

 
   hash_table[position]->Append (key, object);
 
   hash_table[position]->Append (key, object);

+  m_count++;

 }
 
 wxObject *wxHashTable::Get (long key, long value) const
 {
   // Should NEVER be
   long k = (long) key;
 }
 
 wxObject *wxHashTable::Get (long key, long value) const
 {
   // Should NEVER be
   long k = (long) key;

-  if (k < 0)
-    k = -k;

 
   int position = (int) (k % n);
 
   int position = (int) (k % n);

+  if (position < 0) position = -position;
+

   if (!hash_table[position])
     return (wxObject *) NULL;
   else
     {
       wxNode *node = hash_table[position]->Find (value);
       if (node)
   if (!hash_table[position])
     return (wxObject *) NULL;
   else
     {
       wxNode *node = hash_table[position]->Find (value);
       if (node)

-       return node->Data ();
+        return node->Data ();

       else
       else

-       return (wxObject *) 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;
 {
   // Should NEVER be
   long k = (long) key;

-  if (k < 0)
-    k = -k;

 
   int position = (int) (k % n);
 
   int position = (int) (k % n);

+  if (position < 0) position = -position;
+

   if (!hash_table[position])
     return (wxObject *) NULL;
   else
     {
       wxNode *node = hash_table[position]->Find (value);
       if (node)
   if (!hash_table[position])
     return (wxObject *) NULL;
   else
     {
       wxNode *node = hash_table[position]->Find (value);
       if (node)

-       return node->Data ();
+        return node->Data ();

       else
       else

-       return (wxObject *) NULL;
+        return (wxObject *) NULL;

     }
 }
 
     }
 }
 


@@ -167,10 +307,10 @@ wxObject *wxHashTable::Get (long key) const
 {
   // Should NEVER be
   long k = (long) key;
 {
   // Should NEVER be
   long k = (long) key;

-  if (k < 0)
-    k = -k;

 
   int position = (int) (k % n);
 
   int position = (int) (k % n);

+  if (position < 0) position = -position;
+

   if (!hash_table[position])
     return (wxObject *) NULL;
   else
   if (!hash_table[position])
     return (wxObject *) NULL;
   else


@@ -180,9 +320,10 @@ 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);
 {
   int position = (int) (MakeKey (key) % n);

+  if (position < 0) position = -position;

 
   if (!hash_table[position])
     return (wxObject *) NULL;
 
   if (!hash_table[position])
     return (wxObject *) NULL;


@@ -197,42 +338,46 @@ wxObject *wxHashTable::Delete (long key)
 {
   // Should NEVER be
   long k = (long) key;
 {
   // Should NEVER be
   long k = (long) key;

-  if (k < 0)
-    k = -k;

 
   int position = (int) (k % n);
 
   int position = (int) (k % n);

+  if (position < 0) position = -position;
+

   if (!hash_table[position])
     return (wxObject *) NULL;
   else
     {
       wxNode *node = hash_table[position]->Find (k);
       if (node)
   if (!hash_table[position])
     return (wxObject *) NULL;
   else
     {
       wxNode *node = hash_table[position]->Find (k);
       if (node)

-       {
-         wxObject *data = node->Data ();
-         delete node;
-         return data;
-       }
+        {
+          wxObject *data = node->Data ();
+          delete node;
+          m_count--;
+          return data;
+        }

       else
       else

-       return (wxObject *) NULL;
+        return (wxObject *) NULL;

     }
 }
 
     }
 }
 

-wxObject *wxHashTable::Delete (const char *key)
+wxObject *wxHashTable::Delete (const wxChar *key)

 {
   int position = (int) (MakeKey (key) % n);
 {
   int position = (int) (MakeKey (key) % n);

+  if (position < 0) position = -position;
+

   if (!hash_table[position])
     return (wxObject *) NULL;
   else
     {
       wxNode *node = hash_table[position]->Find (key);
       if (node)
   if (!hash_table[position])
     return (wxObject *) NULL;
   else
     {
       wxNode *node = hash_table[position]->Find (key);
       if (node)

-       {
-         wxObject *data = node->Data ();
-         delete node;
-         return data;
-       }
+        {
+          wxObject *data = node->Data ();
+          delete node;
+          m_count--;
+          return data;
+        }

       else
       else

-       return (wxObject *) NULL;
+        return (wxObject *) NULL;

     }
 }
 
     }
 }
 


@@ -240,90 +385,94 @@ wxObject *wxHashTable::Delete (long key, int value)
 {
   // Should NEVER be
   long k = (long) key;
 {
   // Should NEVER be
   long k = (long) key;

-  if (k < 0)
-    k = -k;

 
   int position = (int) (k % n);
 
   int position = (int) (k % n);

+  if (position < 0) position = -position;
+

   if (!hash_table[position])
     return (wxObject *) NULL;
   else
     {
       wxNode *node = hash_table[position]->Find (value);
       if (node)
   if (!hash_table[position])
     return (wxObject *) NULL;
   else
     {
       wxNode *node = hash_table[position]->Find (value);
       if (node)

-       {
-         wxObject *data = node->Data ();
-         delete node;
-         return data;
-       }
+        {
+          wxObject *data = node->Data ();
+          delete node;
+          m_count--;
+          return data;
+        }

       else
       else

-       return (wxObject *) 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);
 {
   int position = (int) (key % n);

+  if (position < 0) position = -position;
+

   if (!hash_table[position])
     return (wxObject *) NULL;
   else
     {
       wxNode *node = hash_table[position]->Find (value);
       if (node)
   if (!hash_table[position])
     return (wxObject *) NULL;
   else
     {
       wxNode *node = hash_table[position]->Find (value);
       if (node)

-       {
-         wxObject *data = node->Data ();
-         delete node;
-         return data;
-       }
+        {
+          wxObject *data = node->Data ();
+          delete node;
+          m_count--;
+          return data;
+        }

       else
       else

-       return (wxObject *) NULL;
+        return (wxObject *) NULL;

     }
 }
 
     }
 }
 

-long wxHashTable::MakeKey (const char *string) const
+long wxHashTable::MakeKey (const wxChar *string) const

 {
   long int_key = 0;
 
   while (*string)
 {
   long int_key = 0;
 
   while (*string)

-    int_key += (unsigned char) *string++;
+    int_key += (wxUChar) *string++;

 
   return int_key;
 }
 
 
   return int_key;
 }
 

-void wxHashTable::BeginFind (void)
+void wxHashTable::BeginFind ()

 {
   current_position = -1;
   current_node = (wxNode *) NULL;
 }
 
 {
   current_position = -1;
   current_node = (wxNode *) NULL;
 }
 

-wxNode *wxHashTable::Next (void)
+wxNode *wxHashTable::Next ()

 {
   wxNode *found = (wxNode *) NULL;
   bool end = FALSE;
   while (!end && !found)
     {
       if (!current_node)
 {
   wxNode *found = (wxNode *) NULL;
   bool end = FALSE;
   while (!end && !found)
     {
       if (!current_node)

-       {
-         current_position++;
-         if (current_position >= n)
-           {
-             current_position = -1;
-             current_node = (wxNode *) NULL;
-             end = TRUE;
-           }
-         else
-           {
-             if (hash_table[current_position])
-               {
-                 current_node = hash_table[current_position]->First ();
-                 found = current_node;
-               }
-           }
-       }
+        {
+          current_position++;
+          if (current_position >= n)
+            {
+              current_position = -1;
+              current_node = (wxNode *) NULL;
+              end = TRUE;
+            }
+          else
+            {
+              if (hash_table[current_position])
+                {
+                  current_node = hash_table[current_position]->First ();
+                  found = current_node;
+                }
+            }
+        }

       else
       else

-       {
-         current_node = current_node->Next ();
-         found = current_node;
-       }
+        {
+          current_node = current_node->Next ();
+          found = current_node;
+        }

     }
   return found;
 }
     }
   return found;
 }


@@ -331,20 +480,22 @@ wxNode *wxHashTable::Next (void)
 void wxHashTable::DeleteContents (bool flag)
 {
   int i;
 void wxHashTable::DeleteContents (bool flag)
 {
   int i;

+  m_deleteContents = flag;

   for (i = 0; i < n; i++)
     {
       if (hash_table[i])
   for (i = 0; i < n; i++)
     {
       if (hash_table[i])

-       hash_table[i]->DeleteContents (flag);
+        hash_table[i]->DeleteContents (flag);

     }
 }
 
     }
 }
 

-void wxHashTable::Clear (void)
+void wxHashTable::Clear ()

 {
   int i;
   for (i = 0; i < n; i++)
     {
       if (hash_table[i])
 {
   int i;
   for (i = 0; i < n; i++)
     {
       if (hash_table[i])

-       hash_table[i]->Clear ();
+        hash_table[i]->Clear ();

     }
     }

+  m_count = 0;

 }
 
 }