X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6aa33060cd9132116fa3431b4889342e2f655853..ba5787676d002f76b4c3944cb598b626f10f058d:/include/wx/hash.h diff --git a/include/wx/hash.h b/include/wx/hash.h index 194302ae7a..106290a216 100644 --- a/include/wx/hash.h +++ b/include/wx/hash.h @@ -5,24 +5,16 @@ // 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__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "hash.h" -#endif - #include "wx/defs.h" -#if !wxUSE_STL && WXWIN_COMPATIBILITY_2_4 - #define wxUSE_OLD_HASH_TABLE 1 -#else - #define wxUSE_OLD_HASH_TABLE 0 -#endif +#define wxUSE_OLD_HASH_TABLE 0 #if !wxUSE_STL #include "wx/object.h" @@ -32,9 +24,6 @@ #if wxUSE_OLD_HASH_TABLE #include "wx/list.h" #endif -#if WXWIN_COMPATIBILITY_2_4 - #include "wx/dynarray.h" -#endif // the default size of the hash #define wxHASH_SIZE_DEFAULT (1000) @@ -111,6 +100,10 @@ union wxHashKeyValue wxChar *string; }; +// 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_Node { friend class WXDLLIMPEXP_BASE wxHashTableBase; @@ -225,85 +218,6 @@ private: #endif // wxUSE_OLD_HASH_TABLE -#if !wxUSE_STL - -#if WXWIN_COMPATIBILITY_2_4 - -// ---------------------------------------------------------------------------- -// a hash table which stores longs -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxHashTableLong : public wxObject -{ -public: - wxHashTableLong(size_t size = wxHASH_SIZE_DEFAULT) - { Init(size); } - virtual ~wxHashTableLong(); - - void Create(size_t size = wxHASH_SIZE_DEFAULT); - void Destroy(); - - size_t GetSize() const { return m_hashSize; } - size_t GetCount() const { return m_count; } - - void Put(long key, long value); - long Get(long key) const; - long Delete(long key); - -protected: - void Init(size_t size); - -private: - wxArrayLong **m_values, - **m_keys; - - // the size of array above - size_t m_hashSize; - - // the total number of elements in the hash - size_t m_count; - - // not implemented yet - DECLARE_NO_COPY_CLASS(wxHashTableLong) -}; - -// ---------------------------------------------------------------------------- -// wxStringHashTable: a hash table which indexes strings with longs -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxStringHashTable : public wxObject -{ -public: - wxStringHashTable(size_t sizeTable = wxHASH_SIZE_DEFAULT); - virtual ~wxStringHashTable(); - - // add a string associated with this key to the table - void Put(long key, const wxString& value); - - // 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; - - // remove the item, returning TRUE if the item was found and deleted - bool Delete(long key) const; - - // clean up - void Destroy(); - -private: - wxArrayLong **m_keys; - wxArrayString **m_values; - - // the size of array above - size_t m_hashSize; - - DECLARE_NO_COPY_CLASS(wxStringHashTable) -}; - -#endif // WXWIN_COMPATIBILITY_2_4 - -#endif // !wxUSE_STL - // ---------------------------------------------------------------------------- // for compatibility only // ---------------------------------------------------------------------------- @@ -348,37 +262,35 @@ public: const wxHashTable& operator=( const wxHashTable& ); - void Destroy() { Clear(); } - // key and value are the same void Put(long value, wxObject *object) { DoPut( value, value, object ); } - void Put(long hash, long value, wxObject *object) - { DoPut( value, hash, 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 hash, const wxChar *value, wxObject *object) - { DoPut( value, hash, object ); } + void Put(long lhash, const wxChar *value, wxObject *object) + { DoPut( value, lhash, object ); } // key and value are the same wxObject *Get(long value) const { return (wxObject*)DoGet( value, value ); } - wxObject *Get(long hash, long value) const - { return (wxObject*)DoGet( value, hash ); } + 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 hash, const wxChar *value) const - { return (wxObject*)DoGet( value, hash ); } + wxObject *Get(long lhash, const wxChar *value) const + { return (wxObject*)DoGet( value, lhash ); } // Deletes entry and returns data if found wxObject *Delete(long key) { return (wxObject*)DoDelete( key, key ); } - wxObject *Delete(long hash, long key) - { return (wxObject*)DoDelete( key, hash ); } + 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 hash, const wxChar *key) - { return (wxObject*)DoDelete( key, hash ); } + wxObject *Delete(long lhash, const wxChar *key) + { return (wxObject*)DoDelete( key, lhash ); } // Construct your own integer key from a string, e.g. in case // you need to combine it with something @@ -395,8 +307,6 @@ public: size_t GetCount() const { return wxHashTableBase::GetCount(); } protected: - virtual void DoDeleteContents( wxHashTableBase_Node* node ); - // copy helper void DoCopy( const wxHashTable& copy ); @@ -404,6 +314,8 @@ protected: // m_curr to it and m_currBucket to its bucket void GetNextNode( size_t bucketStart ); private: + virtual void DoDeleteContents( wxHashTableBase_Node* node ); + // current node Node* m_curr; @@ -428,7 +340,7 @@ public: 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() @@ -518,17 +430,16 @@ private: \ virtual ~hashclass() { Destroy(); } \ \ - void Destroy() { Clear(); } \ void Put(long key, eltype *data) { DoPut(key, key, (void*)data); } \ - void Put(long hash, long key, eltype *data) \ - { DoPut(key, hash, (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 hash, long key) const \ - { return (eltype*)DoGet(key, hash); } \ + eltype *Get(long lhash, long key) const \ + { return (eltype*)DoGet(key, lhash); } \ eltype *Delete(long key) { return (eltype*)DoDelete(key, key); } \ - eltype *Delete(long hash, long key) \ - { return (eltype*)DoDelete(key, hash); } \ - protected: \ + eltype *Delete(long lhash, long key) \ + { return (eltype*)DoDelete(key, lhash); } \ + private: \ virtual void DoDeleteContents( wxHashTableBase_Node* node ) \ { delete (eltype*)node->GetData(); } \ \ @@ -545,7 +456,7 @@ private: 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); } \ @@ -587,7 +498,7 @@ private: { \ 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); \