X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/222702b112dcc7bebe018d6f4d66fe469fefd02c..ba5787676d002f76b4c3944cb598b626f10f058d:/include/wx/hash.h

diff --git a/include/wx/hash.h b/include/wx/hash.h
index cefc7996bd..106290a216 100644
--- a/include/wx/hash.h
+++ b/include/wx/hash.h
@@ -12,17 +12,9 @@
 #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)
@@ -229,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
 // ----------------------------------------------------------------------------
@@ -397,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 );
 
@@ -406,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;
 
@@ -430,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()
@@ -529,7 +439,7 @@ private:
         eltype *Delete(long key) { return (eltype*)DoDelete(key, key); }      \
         eltype *Delete(long lhash, long key)                                  \
             { return (eltype*)DoDelete(key, lhash); }                         \
-    protected:                                                                \
+    private:                                                                  \
         virtual void DoDeleteContents( wxHashTableBase_Node* node )           \
             { delete (eltype*)node->GetData(); }                              \
                                                                               \
@@ -546,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); }            \