private:
// no copy ctor/assignment operator (yet)
- DECLARE_NO_COPY_CLASS(wxHashTableBase);
+ DECLARE_NO_COPY_CLASS(wxHashTableBase)
};
// ----------------------------------------------------------------------------
size_t m_count;
// not implemented yet
- DECLARE_NO_COPY_CLASS(wxHashTableLong);
+ 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)
};
// ----------------------------------------------------------------------------
~wxHashTable();
// copy ctor and assignment operator
- wxHashTable(const wxHashTable& table) { DoCopy(table); }
+ wxHashTable(const wxHashTable& table) : wxObject() { DoCopy(table); }
wxHashTable& operator=(const wxHashTable& table)
{ Clear(); DoCopy(table); return *this; }
// 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, \
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] ) \
{ \
} \
}
+// 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)
+
+#define WX_DECLARE_USER_EXPORTED_HASH(el, list, hash, usergoo) \
+ _WX_DECLARE_HASH(el, list, hash, class usergoo)
+
#endif
// _WX_HASH_H__