X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5dbe15d0bacde245539f54c4d97af6b4696f01f..a4f6fe43c33bd7933645d110ad2719871dab043d:/include/wx/hash.h diff --git a/include/wx/hash.h b/include/wx/hash.h index e825e0c2d1..d88d38275b 100644 --- a/include/wx/hash.h +++ b/include/wx/hash.h @@ -15,7 +15,7 @@ #include "wx/defs.h" #include "wx/string.h" -#if !wxUSE_STL +#if !wxUSE_STD_CONTAINERS #include "wx/object.h" #else class WXDLLIMPEXP_FWD_BASE wxObject; @@ -80,7 +80,7 @@ protected: }; class WXDLLIMPEXP_BASE wxHashTableBase -#if !wxUSE_STL +#if !wxUSE_STD_CONTAINERS : public wxObject #endif { @@ -150,7 +150,7 @@ protected: bool m_deleteContents; private: - DECLARE_NO_COPY_CLASS(wxHashTableBase) + wxDECLARE_NO_COPY_CLASS(wxHashTableBase); }; // ---------------------------------------------------------------------------- @@ -287,7 +287,7 @@ private: // 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) + _WX_DECLARE_HASH(el, list, hash, class WXDLLIMPEXP_CORE) #define WX_DECLARE_USER_EXPORTED_HASH(el, list, hash, usergoo) \ _WX_DECLARE_HASH(el, list, hash, class usergoo)