X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a95e38c03464c854af73b960b17db12624bd8f8c..03e11df5470fd64d9d9a669d0b50b84c2d714736:/src/common/hash.cpp

diff --git a/src/common/hash.cpp b/src/common/hash.cpp
index 78e1c6039d..09e9b42d13 100644
--- a/src/common/hash.cpp
+++ b/src/common/hash.cpp
@@ -104,7 +104,7 @@ void wxHashTableBase::DeleteContents(bool flag)
 
 wxNodeBase *wxHashTableBase::GetNode(long key, long value) const
 {
-    size_t slot = (size_t)abs(key % m_hashSize);
+    size_t slot = (size_t)abs((int)(key % (long)m_hashSize));
 
     wxNodeBase *node;
     if ( m_hashTable[slot] )
@@ -161,7 +161,7 @@ void wxHashTableLong::Put(long key, long value)
 {
     wxCHECK_RET( m_hashSize, _T("must call Create() first") );
 
-    size_t slot = (size_t)abs(key % m_hashSize);
+    size_t slot = (size_t)abs((int)(key % (long)m_hashSize));
 
     if ( !m_keys[slot] )
     {
@@ -179,7 +179,7 @@ long wxHashTableLong::Get(long key) const
 {
     wxCHECK_MSG( m_hashSize, wxNOT_FOUND, _T("must call Create() first") );
 
-    size_t slot = (size_t)abs(key % m_hashSize);
+    size_t slot = (size_t)abs((int)(key % (long)m_hashSize));
 
     wxArrayLong *keys = m_keys[slot];
     if ( keys )
@@ -201,7 +201,7 @@ long wxHashTableLong::Delete(long key)
 {
     wxCHECK_MSG( m_hashSize, wxNOT_FOUND, _T("must call Create() first") );
 
-    size_t slot = (size_t)abs(key % m_hashSize);
+    size_t slot = (size_t)abs((int)(key % (long)m_hashSize));
 
     wxArrayLong *keys = m_keys[slot];
     if ( keys )
@@ -226,6 +226,85 @@ long wxHashTableLong::Delete(long key)
     return wxNOT_FOUND;
 }
 
+// ----------------------------------------------------------------------------
+// wxStringHashTable: more efficient than storing strings in a list
+// ----------------------------------------------------------------------------
+
+wxStringHashTable::wxStringHashTable(size_t sizeTable)
+{
+    m_keys = new wxArrayLong *[sizeTable];
+    m_values = new wxArrayString *[sizeTable];
+
+    m_hashSize = sizeTable;
+    for ( size_t n = 0; n < m_hashSize; n++ )
+    {
+        m_values[n] = (wxArrayString *)NULL;
+        m_keys[n] = (wxArrayLong *)NULL;
+    }
+}
+
+wxStringHashTable::~wxStringHashTable()
+{
+    Destroy();
+}
+
+void wxStringHashTable::Destroy()
+{
+    for ( size_t n = 0; n < m_hashSize; n++ )
+    {
+        delete m_values[n];
+        delete m_keys[n];
+    }
+
+    delete [] m_values;
+    delete [] m_keys;
+    m_hashSize = 0;
+}
+
+void wxStringHashTable::Put(long key, const wxString& value)
+{
+    wxCHECK_RET( m_hashSize, _T("must call Create() first") );
+
+    size_t slot = (size_t)abs((int)(key % (long)m_hashSize));
+
+    if ( !m_keys[slot] )
+    {
+        m_keys[slot] = new wxArrayLong;
+        m_values[slot] = new wxArrayString;
+    }
+
+    m_keys[slot]->Add(key);
+    m_values[slot]->Add(value);
+}
+
+wxString wxStringHashTable::Get(long key, bool *wasFound) const
+{
+    wxCHECK_MSG( m_hashSize, _T(""), _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 )
+            {
+                if ( wasFound )
+                    *wasFound = TRUE;
+
+                return m_values[slot]->Item(n);
+            }
+        }
+    }
+
+    if ( wasFound )
+        *wasFound = FALSE;
+
+    return _T("");
+}
+
 // ----------------------------------------------------------------------------
 // old not type safe wxHashTable
 // ----------------------------------------------------------------------------