X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1a0d517ea4dbcef61ba9b0868318f686e97618bb..7af0846427683d08c44b5d88f39c932ace31843c:/include/wx/hash.h?ds=inline

diff --git a/include/wx/hash.h b/include/wx/hash.h
index 7ac1e05a7a..5ac029b01e 100644
--- a/include/wx/hash.h
+++ b/include/wx/hash.h
@@ -12,7 +12,7 @@
 #ifndef _WX_HASH_H__
 #define _WX_HASH_H__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "hash.h"
 #endif
 
@@ -34,7 +34,7 @@
 // pointers to objects
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxHashTableBase : public wxObject
+class WXDLLIMPEXP_BASE wxHashTableBase : public wxObject
 {
 public:
     wxHashTableBase();
@@ -72,14 +72,17 @@ private:
     DECLARE_NO_COPY_CLASS(wxHashTableBase)
 };
 
+#if WXWIN_COMPATIBILITY_2_4
+
 // ----------------------------------------------------------------------------
 // a hash table which stores longs
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxHashTableLong : public wxObject
+class WXDLLIMPEXP_BASE wxHashTableLong : public wxObject
 {
 public:
-    wxHashTableLong(size_t size = wxHASH_SIZE_DEFAULT) { Init(size); }
+    wxHashTableLong(size_t size = wxHASH_SIZE_DEFAULT)
+        { Init(size); }
     virtual ~wxHashTableLong();
 
     void Create(size_t size = wxHASH_SIZE_DEFAULT);
@@ -113,7 +116,7 @@ private:
 // wxStringHashTable: a hash table which indexes strings with longs
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxStringHashTable : public wxObject
+class WXDLLIMPEXP_BASE wxStringHashTable : public wxObject
 {
 public:
     wxStringHashTable(size_t sizeTable = wxHASH_SIZE_DEFAULT);
@@ -126,6 +129,9 @@ public:
     // 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();
 
@@ -139,11 +145,13 @@ private:
     DECLARE_NO_COPY_CLASS(wxStringHashTable)
 };
 
+#endif
+
 // ----------------------------------------------------------------------------
 // for compatibility only
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxHashTable : public wxObject
+class WXDLLIMPEXP_BASE wxHashTable : public wxObject
 {
 public:
     int n;
@@ -158,7 +166,8 @@ public:
     ~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; }
 
@@ -297,5 +306,26 @@ private:
 #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)
+
+// delete all hash elements
+//
+// NB: the class declaration of the hash elements must be visible from the
+//     place where you use this macro, otherwise the proper destructor may not
+//     be called (a decent compiler should give a warning about it, but don't
+//     count on it)!
+#define WX_CLEAR_HASH_TABLE(array)                                           \
+    {                                                                        \
+        (array).BeginFind();                                                 \
+        wxNode* it = (array).Next();                                         \
+        while( it )                                                          \
+        {                                                                    \
+            delete it->GetData();                                            \
+            it = (array).Next();                                             \
+        }                                                                    \
+        (array).Clear();                                                     \
+    }
+
 #endif
     // _WX_HASH_H__