Improved wxDCPen/BrushChangers.

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

diff --git a/src/common/hash.cpp b/src/common/hash.cpp
index d2a71fa8d31d35bda0606aeb2ef36f3b12d0c739..9a538b0fd98f5dee16a2aef2d0a1f99ff761ee4a 100644 (file)
--- a/src/common/hash.cpp
+++ b/src/common/hash.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        hash.cpp
+// Name:        src/common/hash.cpp
 // Purpose:     wxHashTable implementation
 // Author:      Julian Smart
 // Modified by: VZ at 25.02.00: type safe hashes with WX_DECLARE_HASH()
@@ -17,24 +17,19 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "hash.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
-#include "wx/list.h"
+    #include "wx/list.h"
+    #include "wx/hash.h"
 #endif
 
-#include "wx/hash.h"
-
-#if !wxUSE_STL
+#if wxUSE_OLD_HASH_TABLE
 
 #include <string.h>
 #include <stdarg.h>
@@ -55,7 +50,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxHashTable, wxObject)
 
 wxHashTableBase::wxHashTableBase()
 {
-    m_deleteContents = FALSE;
+    m_deleteContents = false;
     m_hashTable = (wxListBase **)NULL;
     m_hashSize = 0;
     m_count = 0;
@@ -288,7 +283,7 @@ void wxStringHashTable::Put(long key, const wxString& value)
 
 wxString wxStringHashTable::Get(long key, bool *wasFound) const
 {
-    wxCHECK_MSG( m_hashSize, _T(""), _T("must call Create() first") );
+    wxCHECK_MSG( m_hashSize, wxEmptyString, _T("must call Create() first") );
 
     size_t slot = (size_t)abs((int)(key % (long)m_hashSize));
 
@@ -301,7 +296,7 @@ wxString wxStringHashTable::Get(long key, bool *wasFound) const
             if ( keys->Item(n) == key )
             {
                 if ( wasFound )
-                    *wasFound = TRUE;
+                    *wasFound = true;
 
                 return m_values[slot]->Item(n);
             }
@@ -309,14 +304,14 @@ wxString wxStringHashTable::Get(long key, bool *wasFound) const
     }
 
     if ( wasFound )
-        *wasFound = FALSE;
+        *wasFound = false;
 
-    return _T("");
+    return wxEmptyString;
 }
 
 bool wxStringHashTable::Delete(long key) const
 {
-    wxCHECK_MSG( m_hashSize, FALSE, _T("must call Create() first") );
+    wxCHECK_MSG( m_hashSize, false, _T("must call Create() first") );
 
     size_t slot = (size_t)abs((int)(key % (long)m_hashSize));
 
@@ -330,12 +325,12 @@ bool wxStringHashTable::Delete(long key) const
             {
                 keys->RemoveAt(n);
                 m_values[slot]->RemoveAt(n);
-                return TRUE;
+                return true;
             }
         }
     }
 
-    return FALSE;
+    return false;
 }
 
 #endif // WXWIN_COMPATIBILITY_2_4
@@ -350,7 +345,7 @@ wxHashTable::wxHashTable (int the_key_type, int size)
   hash_table = (wxList**) NULL;
   Create(the_key_type, size);
   m_count = 0;
-  m_deleteContents = FALSE;
+  m_deleteContents = false;
 /*
   n = size;
   current_position = -1;
@@ -393,7 +388,7 @@ bool wxHashTable::Create(int the_key_type, int size)
   int i;
   for (i = 0; i < size; i++)
     hash_table[i] = (wxList *) NULL;
-  return TRUE;
+  return true;
 }
 
 
@@ -427,7 +422,7 @@ void wxHashTable::Put (long key, long value, wxObject * object)
   if (!hash_table[position])
   {
     hash_table[position] = new wxList (wxKEY_INTEGER);
-    if (m_deleteContents) hash_table[position]->DeleteContents(TRUE);
+    if (m_deleteContents) hash_table[position]->DeleteContents(true);
   }
 
   hash_table[position]->Append (value, object);
@@ -445,7 +440,7 @@ void wxHashTable::Put (long key, const wxChar *value, wxObject * object)
   if (!hash_table[position])
   {
     hash_table[position] = new wxList (wxKEY_STRING);
-    if (m_deleteContents) hash_table[position]->DeleteContents(TRUE);
+    if (m_deleteContents) hash_table[position]->DeleteContents(true);
   }
 
   hash_table[position]->Append (value, object);
@@ -463,7 +458,7 @@ void wxHashTable::Put (long key, wxObject * object)
   if (!hash_table[position])
   {
     hash_table[position] = new wxList (wxKEY_INTEGER);
-    if (m_deleteContents) hash_table[position]->DeleteContents(TRUE);
+    if (m_deleteContents) hash_table[position]->DeleteContents(true);
   }
 
   hash_table[position]->Append (k, object);
@@ -478,7 +473,7 @@ void wxHashTable::Put (const wxChar *key, wxObject * object)
   if (!hash_table[position])
   {
     hash_table[position] = new wxList (wxKEY_STRING);
-    if (m_deleteContents) hash_table[position]->DeleteContents(TRUE);
+    if (m_deleteContents) hash_table[position]->DeleteContents(true);
   }
 
   hash_table[position]->Append (key, object);
@@ -669,7 +664,7 @@ void wxHashTable::BeginFind ()
 wxHashTable::Node* wxHashTable::Next ()
 {
   wxNode *found = (wxNode *) NULL;
-  bool end = FALSE;
+  bool end = false;
   while (!end && !found)
     {
       if (!current_node)
@@ -679,7 +674,7 @@ wxHashTable::Node* wxHashTable::Next ()
             {
               current_position = -1;
               current_node = (wxNode *) NULL;
-              end = TRUE;
+              end = true;
             }
           else
             {
@@ -724,9 +719,7 @@ void wxHashTable::Clear ()
   m_count = 0;
 }
 
-#else // if wxUSE_STL
-
-#include "wx/object.h"
+#else // if !wxUSE_OLD_HASH_TABLE
 
 wxHashTableBase_Node::wxHashTableBase_Node( long key, void* value,
                                             wxHashTableBase* table )
@@ -755,11 +748,6 @@ wxHashTableBase::wxHashTableBase()
 {
 }
 
-wxHashTableBase::~wxHashTableBase()
-{
-    Destroy();
-}
-
 void wxHashTableBase::Create( wxKeyType keyType, size_t size )
 {
     m_keyType = keyType;
@@ -815,7 +803,7 @@ void wxHashTableBase::DoRemoveNode( wxHashTableBase_Node* node )
         Node* prev = start;
 
         for( curr = prev->GetNext(); curr != node;
-             prev = curr, curr = curr->GetNext() );
+             prev = curr, curr = curr->GetNext() ) ;
 
         DoUnlinkNode( bucket, node, prev );
     }
@@ -1025,9 +1013,12 @@ long wxHashTableBase::MakeKey( const wxChar *str )
     return int_key;
 }
 
-//
+// ----------------------------------------------------------------------------
+// wxHashTable
+// ----------------------------------------------------------------------------
 
 wxHashTable::wxHashTable( const wxHashTable& table )
+           : wxHashTableBase()
 {
     DoCopy( table );
 }
@@ -1040,11 +1031,11 @@ const wxHashTable& wxHashTable::operator=( const wxHashTable& table )
     return *this;
 }
 
-void wxHashTable::DoCopy( const wxHashTable& table )
+void wxHashTable::DoCopy( const wxHashTable& WXUNUSED(table) )
 {
     Create( m_keyType, m_size );
 
-    wxASSERT( false );
+    wxFAIL;
 }
 
 void wxHashTable::DoDeleteContents( wxHashTableBase_Node* node )
@@ -1083,4 +1074,4 @@ wxHashTable::Node* wxHashTable::Next()
     return m_curr;
 }
 
-#endif // wxUSE_STL
+#endif // !wxUSE_OLD_HASH_TABLE