another compilation fix

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

diff --git a/include/wx/hash.h b/include/wx/hash.h
index 4320f720c8f9fe5bae85dea5277fc292f9b862cf..575216d21cc8245fbaec6158cb18b9fc9c2bcad1 100644 (file)
--- a/include/wx/hash.h
+++ b/include/wx/hash.h
@@ -80,6 +80,7 @@ class WXDLLEXPORT 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();
@@ -108,6 +109,36 @@ private:
     DECLARE_NO_COPY_CLASS(wxHashTableLong);
 };
 
+// ----------------------------------------------------------------------------
+// wxStringHashTable: a hash table which indexes strings with longs
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT 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;
+
+    // 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);
+};
+
 // ----------------------------------------------------------------------------
 // for compatibility only
 // ----------------------------------------------------------------------------
@@ -199,8 +230,8 @@ private:
 
 // defines a new type safe hash table which stores the elements of type eltype
 // in lists of class listclass
-#define WX_DECLARE_HASH(eltype, listclass, hashclass)                          \
-    class WXDLLEXPORT hashclass : public wxHashTableBase                       \
+#define _WX_DECLARE_HASH(eltype, listclass, hashclass, classexp)               \
+    classexp hashclass : public wxHashTableBase                                \
     {                                                                          \
     public:                                                                    \
         hashclass(wxKeyType keyType = wxKEY_INTEGER,                           \
@@ -243,7 +274,7 @@ private:
     protected:                                                                 \
         void DoPut(long key, long value, eltype *data)                         \
         {                                                                      \
-            size_t slot = (size_t)abs(key % m_hashSize);                       \
+            size_t slot = (size_t)abs((int)(key % (long)m_hashSize));          \
                                                                                \
             if ( !m_hashTable[slot] )                                          \
             {                                                                  \
@@ -257,5 +288,14 @@ private:
         }                                                                      \
     }
 
+// this macro is to be used in the user code
+#define WX_DECLARE_HASH(el, list, hash) \
+    _WX_DECLARE_HASH(el, list, hash, class)
+
+// and this one does exactly the same thing but should be used inside the
+// library
+#define WX_DECLARE_EXPORTED_HASH(el, list, hash)  \
+    _WX_DECLARE_HASH(el, list, hash, class WXDLLEXPORT)
+
 #endif
     // _WX_HASH_H__