include wx/object.h now that wxConfigBase derives from wxObject

[wxWidgets.git] / include / wx / hash.h

diff --git a/include/wx/hash.h b/include/wx/hash.h
index 3720dd0c1fd0c99246c3e1d932baa2bf42cb1d13..106290a216c818faf58461798d7378191f5ebc77 100644 (file)
--- a/include/wx/hash.h
+++ b/include/wx/hash.h
@@ -5,28 +5,26 @@
 // Modified by: VZ at 25.02.00: type safe hashes with WX_DECLARE_HASH()
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by: VZ at 25.02.00: type safe hashes with WX_DECLARE_HASH()
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c)
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_HASH_H__
 #define _WX_HASH_H__
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_HASH_H__
 #define _WX_HASH_H__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "hash.h"
-#endif
-

 #include "wx/defs.h"
 
 #include "wx/defs.h"
 

+#define wxUSE_OLD_HASH_TABLE 0
+

 #if !wxUSE_STL
 #if !wxUSE_STL

-    #include "wx/list.h"
+    #include "wx/object.h"
+#else
+    class WXDLLIMPEXP_BASE wxObject;

 #endif
 #endif

-#if WXWIN_COMPATIBILITY_2_4
-    #include "wx/dynarray.h"
+#if wxUSE_OLD_HASH_TABLE
+    #include "wx/list.h"

 #endif
 
 #endif
 

-class WXDLLIMPEXP_BASE wxObject;
-

 // the default size of the hash
 #define wxHASH_SIZE_DEFAULT     (1000)
 
 // the default size of the hash
 #define wxHASH_SIZE_DEFAULT     (1000)
 


@@ -42,7 +40,7 @@ class WXDLLIMPEXP_BASE wxObject;
 // pointers to objects
 // ----------------------------------------------------------------------------
 
 // pointers to objects
 // ----------------------------------------------------------------------------
 

-#if !wxUSE_STL
+#if wxUSE_OLD_HASH_TABLE

 
 class WXDLLIMPEXP_BASE wxHashTableBase : public wxObject
 {
 
 class WXDLLIMPEXP_BASE wxHashTableBase : public wxObject
 {


@@ -82,9 +80,7 @@ private:
     DECLARE_NO_COPY_CLASS(wxHashTableBase)
 };
 
     DECLARE_NO_COPY_CLASS(wxHashTableBase)
 };
 

-#else
-
-#include "wx/hashmap.h"
+#else // if !wxUSE_OLD_HASH_TABLE

 
 #if !defined(wxENUM_KEY_TYPE_DEFINED)
 #define wxENUM_KEY_TYPE_DEFINED
 
 #if !defined(wxENUM_KEY_TYPE_DEFINED)
 #define wxENUM_KEY_TYPE_DEFINED


@@ -104,349 +100,237 @@ union wxHashKeyValue
     wxChar *string;
 };
 
     wxChar *string;
 };
 

-struct WXDLLIMPEXP_BASE wxHashTableHash
-{
-    wxHashTableHash() { }
-    wxHashTableHash( wxKeyType keyType ) : m_keyType( keyType ) { }
-
-    wxKeyType m_keyType;
-
-    unsigned long operator ()( const wxHashKeyValue& k ) const
-    {
-        if( m_keyType == wxKEY_STRING )
-            return wxStringHash::wxCharStringHash( k.string );
-        else
-            return (unsigned long)k.integer;
-    }
-};
-
-struct WXDLLIMPEXP_BASE wxHashTableEqual
-{
-    wxHashTableEqual() { }
-    wxHashTableEqual( wxKeyType keyType ) : m_keyType( keyType ) { }
-
-    wxKeyType m_keyType;
-
-    bool operator ()( const wxHashKeyValue& k1, const wxHashKeyValue& k2 ) const
-    {
-        if( m_keyType == wxKEY_STRING )
-            return wxStrcmp( k1.string, k2.string ) == 0;
-        else
-            return k1.integer == k2.integer;
-    }
-};
-
-WX_DECLARE_EXPORTED_HASH_MAP( wxHashKeyValue, 
-                              void*,
-                              wxHashTableHash,
-                              wxHashTableEqual,
-                              wxHashTableBaseBaseBase );
-
-// hack: we should really have HASH_MULTI(MAP|SET), but this requires
-// less work
-
-class WXDLLIMPEXP_BASE wxHashTableBaseBase : public wxHashTableBaseBaseBase
-{
-public:
-    wxHashTableBaseBase(size_t size, const wxHashTableHash& hash,
-                        const wxHashTableEqual& equal)
-        : wxHashTableBaseBaseBase(size, hash, equal)
-    { }
-
-    void multi_insert(const wxHashKeyValue& key, void* value)
-    {
-        CreateNodeLast(value_type(key, value));
-    }
-};
+// for some compilers (AIX xlC), defining it as friend inside the class is not
+// enough, so provide a real forward declaration
+class WXDLLIMPEXP_BASE wxHashTableBase;

 
 

-class WXDLLIMPEXP_BASE wxHashTableBase
+class WXDLLIMPEXP_BASE wxHashTableBase_Node

 {
 {

+    friend class WXDLLIMPEXP_BASE wxHashTableBase;
+    typedef class WXDLLIMPEXP_BASE wxHashTableBase_Node _Node;

 public:
 public:

-    wxHashTableBase( wxKeyType keyType = wxKEY_INTEGER,
-                     size_t size = wxHASH_SIZE_DEFAULT )
-        : m_map( size, wxHashTableHash( keyType ),
-                 wxHashTableEqual( keyType ) ),
-          m_keyType( keyType ) { }
-
-    ~wxHashTableBase() { Clear(); }
-
-    size_t GetCount() const { return m_map.size(); }
-
-    void Clear()
-    {
-        if( m_keyType == wxKEY_STRING )
-        {
-            for( wxHashTableBaseBase::iterator it = m_map.begin(),
-                                               en = m_map.end();
-                 it != en; )
-            {
-                wxChar* tmp = it->first.string;
-                ++it;
-                delete[] tmp; // used in operator++
-            }
-        }
-        m_map.clear();
-    }
-protected:
-    void DoPut( long key, void* data )
-    {
-        wxASSERT( m_keyType == wxKEY_INTEGER );
-
-        wxHashKeyValue k; k.integer = key;
-        m_map.multi_insert(k, data);
-    }
-
-    void DoPut( const wxChar* key, void* data )
-    {
-        wxASSERT( m_keyType == wxKEY_STRING );
-
-        wxHashKeyValue k;
-        k.string = wxStrcpy(new wxChar[wxStrlen(key) + 1], key);
-        m_map.multi_insert(k, data);
-    }
-
-    void* DoGet( long key ) const
-    {
-        wxASSERT( m_keyType == wxKEY_INTEGER );
+    wxHashTableBase_Node( long key, void* value,
+                          wxHashTableBase* table );
+    wxHashTableBase_Node( const wxChar* key, void* value,
+                          wxHashTableBase* table );
+    ~wxHashTableBase_Node();

 
 

-        wxHashKeyValue k; k.integer = key;
-        wxHashTableBaseBase::const_iterator it = m_map.find( k );
+    long GetKeyInteger() const { return m_key.integer; }
+    const wxChar* GetKeyString() const { return m_key.string; }

 
 

-        return it != m_map.end() ? it->second : NULL;
-    }
-
-    void* DoGet( const wxChar* key ) const
-    {
-        wxASSERT( m_keyType == wxKEY_STRING );
-
-        wxHashKeyValue k; k.string = (wxChar*)key;
-        wxHashTableBaseBase::const_iterator it = m_map.find( k );
-
-        return it != m_map.end() ? it->second : NULL;
-    }
-
-    void* DoDelete( long key )
-    {
-        wxASSERT( m_keyType == wxKEY_INTEGER );
-
-        wxHashKeyValue k; k.integer = key;
-        wxHashTableBaseBase::iterator it = m_map.find( k );
-        
-        if( it != m_map.end() )
-        {
-            void* data = it->second;
+    void* GetData() const { return m_value; }
+    void SetData( void* data ) { m_value = data; }

 
 

-            m_map.erase( it );
-            return data;
-        }
-
-        return NULL;
-    }
-
-    void* DoDelete( const wxChar* key )
-    {
-        wxASSERT( m_keyType == wxKEY_STRING );
+protected:
+    _Node* GetNext() const { return m_next; }

 
 

-        wxHashKeyValue k; k.string = (wxChar*)key;
-        wxHashTableBaseBase::iterator it = m_map.find( k );
-        
-        if( it != m_map.end() )
-        {
-            void* data = it->second;
-            wxChar* k = it->first.string;
+protected:
+    // next node in the chain
+    wxHashTableBase_Node* m_next;

 
 

-            m_map.erase( it );
-            delete[] k;
-            return data;
-        }
+    // key
+    wxHashKeyValue m_key;

 
 

-        return NULL;
-    }
+    // value
+    void* m_value;

 
 

-    wxHashTableBaseBase m_map;
-    wxKeyType m_keyType;
+    // pointer to the hash containing the node, used to remove the
+    // node from the hash when the user deletes the node iterating
+    // through it
+    // TODO: move it to wxHashTable_Node (only wxHashTable supports
+    //       iteration)
+    wxHashTableBase* m_hashPtr;

 };
 
 };
 

-#endif // !wxUSE_STL
-
+class WXDLLIMPEXP_BASE wxHashTableBase

 #if !wxUSE_STL
 #if !wxUSE_STL

-
-#if WXWIN_COMPATIBILITY_2_4
-
-// ----------------------------------------------------------------------------
-// a hash table which stores longs
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_BASE wxHashTableLong : public wxObject
+    : public wxObject
+#endif

 {
 {

+    friend class WXDLLIMPEXP_BASE wxHashTableBase_Node;

 public:
 public:

-    wxHashTableLong(size_t size = wxHASH_SIZE_DEFAULT)
-        { Init(size); }
-    virtual ~wxHashTableLong();
+    typedef wxHashTableBase_Node Node;
+
+    wxHashTableBase();
+    virtual ~wxHashTableBase() { };

 
 

-    void Create(size_t size = wxHASH_SIZE_DEFAULT);
+    void Create( wxKeyType keyType = wxKEY_INTEGER,
+                 size_t size = wxHASH_SIZE_DEFAULT );
+    void Clear();

     void Destroy();
 
     void Destroy();
 

-    size_t GetSize() const { return m_hashSize; }
+    size_t GetSize() const { return m_size; }

     size_t GetCount() const { return m_count; }
 
     size_t GetCount() const { return m_count; }
 

-    void Put(long key, long value);
-    long Get(long key) const;
-    long Delete(long key);
+    void DeleteContents( bool flag ) { m_deleteContents = flag; }
+
+    static long MakeKey(const wxChar *string);

 
 protected:
 
 protected:

-    void Init(size_t size);
+    void DoPut( long key, long hash, void* data );
+    void DoPut( const wxChar* key, long hash, void* data );
+    void* DoGet( long key, long hash ) const;
+    void* DoGet( const wxChar* key, long hash ) const;
+    void* DoDelete( long key, long hash );
+    void* DoDelete( const wxChar* key, long hash );

 
 private:
 
 private:

-    wxArrayLong **m_values,
-                **m_keys;
+    // Remove the node from the hash, *only called from
+    // ~wxHashTable*_Node destructor
+    void DoRemoveNode( wxHashTableBase_Node* node );

 
 

-    // the size of array above
-    size_t m_hashSize;
+    // destroys data contained in the node if appropriate:
+    // deletes the key if it is a string and destrys
+    // the value if m_deleteContents is true
+    void DoDestroyNode( wxHashTableBase_Node* node );

 
 

-    // the total number of elements in the hash
-    size_t m_count;
+    // inserts a node in the table (at the end of the chain)
+    void DoInsertNode( size_t bucket, wxHashTableBase_Node* node );

 
 

-    // not implemented yet
-    DECLARE_NO_COPY_CLASS(wxHashTableLong)
-};
+    // removes a node from the table (fiven a pointer to the previous
+    // but does not delete it (only deletes its contents)
+    void DoUnlinkNode( size_t bucket, wxHashTableBase_Node* node,
+                       wxHashTableBase_Node* prev );

 
 

-// ----------------------------------------------------------------------------
-// wxStringHashTable: a hash table which indexes strings with longs
-// ----------------------------------------------------------------------------
+    // unconditionally deletes node value (invoking the
+    // correct destructor)
+    virtual void DoDeleteContents( wxHashTableBase_Node* node ) = 0;

 
 

-class WXDLLIMPEXP_BASE wxStringHashTable : public wxObject
-{
-public:
-    wxStringHashTable(size_t sizeTable = wxHASH_SIZE_DEFAULT);
-    virtual ~wxStringHashTable();
+protected:
+    // number of buckets
+    size_t m_size;

 
 

-    // add a string associated with this key to the table
-    void Put(long key, const wxString& value);
+    // number of nodes (key/value pairs)
+    size_t m_count;

 
 

-    // get the string from the key: if not found, an empty string is returned
-    // and the wasFound is set to FALSE if not NULL
-    wxString Get(long key, bool *wasFound = NULL) const;
+    // table
+    Node** m_table;

 
 

-    // remove the item, returning TRUE if the item was found and deleted
-    bool Delete(long key) const;
+    // key typ (INTEGER/STRING)
+    wxKeyType m_keyType;

 
 

-    // clean up
-    void Destroy();
+    // delete contents when hash is cleared
+    bool m_deleteContents;

 
 private:
 
 private:

-    wxArrayLong **m_keys;
-    wxArrayString **m_values;
-
-    // the size of array above
-    size_t m_hashSize;
-
-    DECLARE_NO_COPY_CLASS(wxStringHashTable)
+    DECLARE_NO_COPY_CLASS(wxHashTableBase)

 };
 
 };
 

-#endif // WXWIN_COMPATIBILITY_2_4
-
-#endif  // !wxUSE_STL
+#endif // wxUSE_OLD_HASH_TABLE

 
 // ----------------------------------------------------------------------------
 // for compatibility only
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // for compatibility only
 // ----------------------------------------------------------------------------
 

-#if wxUSE_STL
+#if !wxUSE_OLD_HASH_TABLE

 
 

-class WXDLLIMPEXP_BASE wxHashTable : protected wxHashTableBase
+class WXDLLIMPEXP_BASE wxHashTable_Node : public wxHashTableBase_Node

 {
 {

-    typedef wxHashTableBaseBase hash;
+    friend class WXDLLIMPEXP_BASE wxHashTable;

 public:
 public:

-    class dummy;
-
-    struct compatibility_iterator
-    {
-        hash::iterator m_iter;
-        hash* m_hash;
-
-        operator bool() const { return m_iter != m_hash->end(); }
-        bool operator !() const { return m_iter == m_hash->end(); }
-        compatibility_iterator( hash* li, hash::iterator it )
-            : m_iter( it ), m_hash( li ) {}
-        compatibility_iterator() { }
-
-        dummy* operator->() { return (dummy*)this; }
-    };
-    typedef compatibility_iterator citer;
-
-    class dummy
-    {
-        typedef hash::iterator it;
-        typedef compatibility_iterator citer;
-    public:
-        wxObject* GetData() const
-        {
-            citer* i = (citer*)this;
-            return (wxObject*)i->m_iter->second;
-        }
-        citer GetNext() const
-        {
-            citer* i = (citer*)this;
-            it lit = i->m_iter;
-            return citer( i->m_hash, ++lit );
-        }
-        void SetData( wxObject* e )
-        {
-            citer* i = (citer*)this;
-            i->m_iter->second = e;
-        }
-    private:
-        dummy();
-    };
+    wxHashTable_Node( long key, void* value,
+                      wxHashTableBase* table )
+        : wxHashTableBase_Node( key, value, table ) { }
+    wxHashTable_Node( const wxChar* key, void* value,
+                      wxHashTableBase* table )
+        : wxHashTableBase_Node( key, value, table ) { }
+
+    wxObject* GetData() const
+        { return (wxObject*)wxHashTableBase_Node::GetData(); }
+    void SetData( wxObject* data )
+        { wxHashTableBase_Node::SetData( data ); }
+
+    wxHashTable_Node* GetNext() const
+        { return (wxHashTable_Node*)wxHashTableBase_Node::GetNext(); }
+};
+
+// should inherit protectedly, but it is public for compatibility in
+// order to publicly inherit from wxObject
+class WXDLLIMPEXP_BASE wxHashTable : public wxHashTableBase
+{
+    typedef wxHashTableBase hash;
+public:
+    typedef wxHashTable_Node Node;
+    typedef wxHashTable_Node* compatibility_iterator;

 public:
     wxHashTable( wxKeyType keyType = wxKEY_INTEGER,
                  size_t size = wxHASH_SIZE_DEFAULT )
 public:
     wxHashTable( wxKeyType keyType = wxKEY_INTEGER,
                  size_t size = wxHASH_SIZE_DEFAULT )

-        : wxHashTableBase( keyType, size ) { }
+        : wxHashTableBase() { Create( keyType, size ); BeginFind(); }
+    wxHashTable( const wxHashTable& table );

 
 

-    void Destroy() { Clear(); }
+    virtual ~wxHashTable() { Destroy(); }
+
+    const wxHashTable& operator=( const wxHashTable& );

 
     // key and value are the same
 
     // key and value are the same

-    void Put(long value, wxObject *object) { DoPut( value, object ); }
-    void Put(const wxChar *value, wxObject *object) { DoPut( value, object ); }
+    void Put(long value, wxObject *object)
+        { DoPut( value, value, object ); }
+    void Put(long lhash, long value, wxObject *object)
+        { DoPut( value, lhash, object ); }
+    void Put(const wxChar *value, wxObject *object)
+        { DoPut( value, MakeKey( value ), object ); }
+    void Put(long lhash, const wxChar *value, wxObject *object)
+        { DoPut( value, lhash, object ); }

 
     // key and value are the same
 
     // key and value are the same

-    wxObject *Get(long value) const { return (wxObject*)DoGet( value ); }
-    wxObject *Get(const wxChar *value) const { return (wxObject*)DoGet( value ); }
+    wxObject *Get(long value) const
+        { return (wxObject*)DoGet( value, value ); }
+    wxObject *Get(long lhash, long value) const
+        { return (wxObject*)DoGet( value, lhash ); }
+    wxObject *Get(const wxChar *value) const
+        { return (wxObject*)DoGet( value, MakeKey( value ) ); }
+    wxObject *Get(long lhash, const wxChar *value) const
+        { return (wxObject*)DoGet( value, lhash ); }

 
     // Deletes entry and returns data if found
 
     // Deletes entry and returns data if found

-    wxObject *Delete(long key) { return (wxObject*)DoDelete( key ); }
-    wxObject *Delete(const wxChar *key) { return (wxObject*)DoDelete( key ); }
+    wxObject *Delete(long key)
+        { return (wxObject*)DoDelete( key, key ); }
+    wxObject *Delete(long lhash, long key)
+        { return (wxObject*)DoDelete( key, lhash ); }
+    wxObject *Delete(const wxChar *key)
+        { return (wxObject*)DoDelete( key, MakeKey( key ) ); }
+    wxObject *Delete(long lhash, const wxChar *key)
+        { return (wxObject*)DoDelete( key, lhash ); }

 
 

-#if 0

     // Construct your own integer key from a string, e.g. in case
     // you need to combine it with something
     // Construct your own integer key from a string, e.g. in case
     // you need to combine it with something

-    long MakeKey(const wxChar *string) const;
-#endif
+    long MakeKey(const wxChar *string) const
+        { return wxHashTableBase::MakeKey(string); }
+

     // Way of iterating through whole hash table (e.g. to delete everything)
     // Not necessary, of course, if you're only storing pointers to
     // objects maintained separately
     // Way of iterating through whole hash table (e.g. to delete everything)
     // Not necessary, of course, if you're only storing pointers to
     // objects maintained separately

-    void BeginFind() { m_iter = citer( &this->m_map, this->m_map.begin() ); }
-    compatibility_iterator Next()
-    {
-        compatibility_iterator it = m_iter;
-        if( m_iter )
-            m_iter = m_iter->GetNext();
-        return it;
-    }
+    void BeginFind() { m_curr = NULL; m_currBucket = 0; }
+    Node* Next();

 
     void Clear() { wxHashTableBase::Clear(); }
 
     size_t GetCount() const { return wxHashTableBase::GetCount(); }
 
     void Clear() { wxHashTableBase::Clear(); }
 
     size_t GetCount() const { return wxHashTableBase::GetCount(); }

+protected:
+    // copy helper
+    void DoCopy( const wxHashTable& copy );
+
+    // searches the next node starting from bucket bucketStart and sets
+    // m_curr to it and m_currBucket to its bucket
+    void GetNextNode( size_t bucketStart );

 private:
 private:

-    compatibility_iterator m_iter;
+    virtual void DoDeleteContents( wxHashTableBase_Node* node );
+
+    // current node
+    Node* m_curr;
+
+    // bucket the current node belongs to
+    size_t m_currBucket;

 };
 
 };
 

-#else // if !wxUSE_STL
+#else // if wxUSE_OLD_HASH_TABLE

 
 class WXDLLIMPEXP_BASE wxHashTable : public wxObject
 {
 public:
 
 class WXDLLIMPEXP_BASE wxHashTable : public wxObject
 {
 public:

+    typedef wxNode Node;
+    typedef wxNode* compatibility_iterator;
+

     int n;
     int current_position;
     wxNode *current_node;
     int n;
     int current_position;
     wxNode *current_node;


@@ -456,7 +340,7 @@ public:
 
     wxHashTable(int the_key_type = wxKEY_INTEGER,
                 int size = wxHASH_SIZE_DEFAULT);
 
     wxHashTable(int the_key_type = wxKEY_INTEGER,
                 int size = wxHASH_SIZE_DEFAULT);

-    ~wxHashTable();
+    virtual ~wxHashTable();

 
     // copy ctor and assignment operator
     wxHashTable(const wxHashTable& table) : wxObject()
 
     // copy ctor and assignment operator
     wxHashTable(const wxHashTable& table) : wxObject()


@@ -515,7 +399,7 @@ public:
     // objects maintained separately
 
     void BeginFind();
     // objects maintained separately
 
     void BeginFind();

-    wxNode *Next();
+    Node* Next();

 
     void DeleteContents(bool flag);
     void Clear();
 
     void DeleteContents(bool flag);
     void Clear();


@@ -523,7 +407,6 @@ public:
     // Returns number of nodes
     size_t GetCount() const { return m_count; }
 
     // Returns number of nodes
     size_t GetCount() const { return m_count; }
 

-    typedef wxNode* compatibility_iterator;

 private:
     size_t m_count;             // number of elements in the hashtable
     bool m_deleteContents;
 private:
     size_t m_count;             // number of elements in the hashtable
     bool m_deleteContents;


@@ -531,9 +414,9 @@ private:
     DECLARE_DYNAMIC_CLASS(wxHashTable)
 };
 
     DECLARE_DYNAMIC_CLASS(wxHashTable)
 };
 

-#endif
+#endif // wxUSE_OLD_HASH_TABLE

 
 

-#if wxUSE_STL
+#if !wxUSE_OLD_HASH_TABLE

 
 // defines a new type safe hash table which stores the elements of type eltype
 // in lists of class listclass
 
 // defines a new type safe hash table which stores the elements of type eltype
 // in lists of class listclass


@@ -543,17 +426,27 @@ private:
     public:                                                                   \
         hashclass(wxKeyType keyType = wxKEY_INTEGER,                          \
                   size_t size = wxHASH_SIZE_DEFAULT)                          \
     public:                                                                   \
         hashclass(wxKeyType keyType = wxKEY_INTEGER,                          \
                   size_t size = wxHASH_SIZE_DEFAULT)                          \

-            : wxHashTableBase(keyType, size) { }                              \
+            : wxHashTableBase() { Create(keyType, size); }                    \
+                                                                              \
+        virtual ~hashclass() { Destroy(); }                                   \

                                                                               \
                                                                               \

-        ~hashclass() { Destroy(); }                                           \
+        void Put(long key, eltype *data) { DoPut(key, key, (void*)data); }    \
+        void Put(long lhash, long key, eltype *data)                          \
+            { DoPut(key, lhash, (void*)data); }                               \
+        eltype *Get(long key) const { return (eltype*)DoGet(key, key); }      \
+        eltype *Get(long lhash, long key) const                               \
+            { return (eltype*)DoGet(key, lhash); }                            \
+        eltype *Delete(long key) { return (eltype*)DoDelete(key, key); }      \
+        eltype *Delete(long lhash, long key)                                  \
+            { return (eltype*)DoDelete(key, lhash); }                         \
+    private:                                                                  \
+        virtual void DoDeleteContents( wxHashTableBase_Node* node )           \
+            { delete (eltype*)node->GetData(); }                              \

                                                                               \
                                                                               \

-        void Destroy() { m_map.clear(); }                                     \
-        void Put(long key, eltype *data) { DoPut(key, (void*)data); }         \
-        eltype *Get(long key) const { return (eltype*)DoGet(key); }           \
-        eltype *Delete(long key) { return (eltype*)DoDelete(key); }           \
+        DECLARE_NO_COPY_CLASS(hashclass)                                      \

     }
 
     }
 

-#else // if !wxUSE_STL
+#else // if wxUSE_OLD_HASH_TABLE

 
 #define _WX_DECLARE_HASH(eltype, listclass, hashclass, classexp)               \
     classexp hashclass : public wxHashTableBase                                \
 
 #define _WX_DECLARE_HASH(eltype, listclass, hashclass, classexp)               \
     classexp hashclass : public wxHashTableBase                                \


@@ -563,7 +456,7 @@ private:
                   size_t size = wxHASH_SIZE_DEFAULT)                           \
             { Create(keyType, size); }                                         \
                                                                                \
                   size_t size = wxHASH_SIZE_DEFAULT)                           \
             { Create(keyType, size); }                                         \
                                                                                \

-        ~hashclass() { Destroy(); }                                            \
+        virtual ~hashclass() { Destroy(); }                                            \

                                                                                \
         void Put(long key, long val, eltype *data) { DoPut(key, val, data); }  \
         void Put(long key, eltype *data) { DoPut(key, key, data); }            \
                                                                                \
         void Put(long key, long val, eltype *data) { DoPut(key, val, data); }  \
         void Put(long key, eltype *data) { DoPut(key, key, data); }            \


@@ -605,7 +498,7 @@ private:
             {                                                                  \
                 m_hashTable[slot] = new listclass(m_keyType);                  \
                 if ( m_deleteContents )                                        \
             {                                                                  \
                 m_hashTable[slot] = new listclass(m_keyType);                  \
                 if ( m_deleteContents )                                        \

-                    m_hashTable[slot]->DeleteContents(TRUE);                   \
+                    m_hashTable[slot]->DeleteContents(true);                   \

             }                                                                  \
                                                                                \
             ((listclass *)m_hashTable[slot])->Append(value, data);             \
             }                                                                  \
                                                                                \
             ((listclass *)m_hashTable[slot])->Append(value, data);             \


@@ -615,7 +508,7 @@ private:
         DECLARE_NO_COPY_CLASS(hashclass)                                       \
     }
 
         DECLARE_NO_COPY_CLASS(hashclass)                                       \
     }
 

-#endif
+#endif // wxUSE_OLD_HASH_TABLE

 
 // this macro is to be used in the user code
 #define WX_DECLARE_HASH(el, list, hash) \
 
 // this macro is to be used in the user code
 #define WX_DECLARE_HASH(el, list, hash) \