X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53e112a093bb479c8032fad7467690196c67c2c6..70ddb200c10bb6f1075f4a39452fdcf77f84fdf5:/src/common/hash.cpp

diff --git a/src/common/hash.cpp b/src/common/hash.cpp
index 50d99ed1b2..9882539bb4 100644
--- 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
 /////////////////////////////////////////////////////////////////////////////
 
@@ -324,7 +324,7 @@ bool wxStringHashTable::Delete(long key) const
         {
             if ( keys->Item(n) == key )
             {
-                keys.RemoveAt(n);
+                keys->RemoveAt(n);
                 m_values[slot]->RemoveAt(n);
                 return TRUE;
             }
@@ -493,7 +493,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;
     }
@@ -513,7 +513,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;
     }
@@ -532,7 +532,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;
     }
 }
 
@@ -546,7 +546,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;
     }
 }
 
@@ -565,7 +565,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;
@@ -587,7 +587,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;
@@ -612,7 +612,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;
@@ -634,7 +634,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;
@@ -679,14 +679,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;
         }
     }