cleaning up problems after string changes

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

diff --git a/include/wx/hash.h b/include/wx/hash.h
index 07ece7d0aa5f6cc4be706c1a474f968d42a534d4..19ca8f06eba010b12ab4d2153b9c508f577fc19b 100644 (file)
--- a/include/wx/hash.h
+++ b/include/wx/hash.h
@@ -13,12 +13,9 @@
 #define _WX_HASH_H__
 
 #include "wx/defs.h"
+#include "wx/string.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"
@@ -28,9 +25,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)
@@ -225,85 +219,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
 // ----------------------------------------------------------------------------
@@ -355,6 +270,9 @@ public:
         { DoPut( value, lhash, object ); }
     void Put(const wxChar *value, wxObject *object)
         { DoPut( value, MakeKey( value ), object ); }
+    // FIXME-UTF8: have only wxString forms here
+    void Put(const wxString& value, wxObject *object)
+        { DoPut( value, MakeKey( value ), object ); }
     void Put(long lhash, const wxChar *value, wxObject *object)
         { DoPut( value, lhash, object ); }
 
@@ -365,6 +283,9 @@ public:
         { return (wxObject*)DoGet( value, lhash ); }
     wxObject *Get(const wxChar *value) const
         { return (wxObject*)DoGet( value, MakeKey( value ) ); }
+    // FIXME-UTF8: have only wxString forms here
+    wxObject *Get(const wxString& value) const
+        { return (wxObject*)DoGet( value, MakeKey( value ) ); }
     wxObject *Get(long lhash, const wxChar *value) const
         { return (wxObject*)DoGet( value, lhash ); }
 
@@ -375,6 +296,9 @@ public:
         { return (wxObject*)DoDelete( key, lhash ); }
     wxObject *Delete(const wxChar *key)
         { return (wxObject*)DoDelete( key, MakeKey( key ) ); }
+    // FIXME-UTF8: have only wxString forms here
+    wxObject *Delete(const wxString& key)
+        { return (wxObject*)DoDelete( key, MakeKey( key ) ); }
     wxObject *Delete(long lhash, const wxChar *key)
         { return (wxObject*)DoDelete( key, lhash ); }
 
@@ -426,7 +350,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()
@@ -542,7 +466,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); }            \