merged 2.2 branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -200,8 +200,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, \
|
||||
@@ -258,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__
|
||||
|
Reference in New Issue
Block a user