Committing in .

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

diff --git a/include/wx/hash.h b/include/wx/hash.h
index 4320f720c8f9fe5bae85dea5277fc292f9b862cf..af9cbbce94d97ce381255a8b75fad2b91f3660ef 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); }
 {
 public:
     wxHashTableLong(size_t size = wxHASH_SIZE_DEFAULT) { Init(size); }

+    virtual ~wxHashTableLong();

 
     void Create(size_t size = wxHASH_SIZE_DEFAULT);
     void Destroy();
 
     void Create(size_t size = wxHASH_SIZE_DEFAULT);
     void Destroy();


@@ -199,8 +200,8 @@ private:
 
 // defines a new type safe hash table which stores the elements of type eltype
 // in lists of class listclass
 
 // 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,                           \
     {                                                                          \
     public:                                                                    \
         hashclass(wxKeyType keyType = wxKEY_INTEGER,                           \


@@ -257,5 +258,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__
 #endif
     // _WX_HASH_H__