X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0518029cecf127dc5e792bb3fcd6781d46c0e0b1..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/hash.h

diff --git a/include/wx/hash.h b/include/wx/hash.h
index 32789cdd78..452040ba31 100644
--- a/include/wx/hash.h
+++ b/include/wx/hash.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by: VZ at 25.02.00: type safe hashes with WX_DECLARE_HASH()
 // Created:     01/02/97
-// RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -15,10 +14,10 @@
 #include "wx/defs.h"
 #include "wx/string.h"
 
-#if !wxUSE_STL
+#if !wxUSE_STD_CONTAINERS
     #include "wx/object.h"
 #else
-    class WXDLLIMPEXP_BASE wxObject;
+    class WXDLLIMPEXP_FWD_BASE wxObject;
 #endif
 
 // the default size of the hash
@@ -39,12 +38,12 @@ union wxHashKeyValue
 
 // for some compilers (AIX xlC), defining it as friend inside the class is not
 // enough, so provide a real forward declaration
-class WXDLLIMPEXP_BASE wxHashTableBase;
+class WXDLLIMPEXP_FWD_BASE wxHashTableBase;
 
 class WXDLLIMPEXP_BASE wxHashTableBase_Node
 {
-    friend class WXDLLIMPEXP_BASE wxHashTableBase;
-    typedef class WXDLLIMPEXP_BASE wxHashTableBase_Node _Node;
+    friend class WXDLLIMPEXP_FWD_BASE wxHashTableBase;
+    typedef class WXDLLIMPEXP_FWD_BASE wxHashTableBase_Node _Node;
 public:
     wxHashTableBase_Node( long key, void* value,
                           wxHashTableBase* table );
@@ -80,11 +79,11 @@ protected:
 };
 
 class WXDLLIMPEXP_BASE wxHashTableBase
-#if !wxUSE_STL
+#if !wxUSE_STD_CONTAINERS
     : public wxObject
 #endif
 {
-    friend class WXDLLIMPEXP_BASE wxHashTableBase_Node;
+    friend class WXDLLIMPEXP_FWD_BASE wxHashTableBase_Node;
 public:
     typedef wxHashTableBase_Node Node;
 
@@ -150,7 +149,7 @@ protected:
     bool m_deleteContents;
 
 private:
-    DECLARE_NO_COPY_CLASS(wxHashTableBase)
+    wxDECLARE_NO_COPY_CLASS(wxHashTableBase);
 };
 
 // ----------------------------------------------------------------------------
@@ -159,7 +158,7 @@ private:
 
 class WXDLLIMPEXP_BASE wxHashTable_Node : public wxHashTableBase_Node
 {
-    friend class WXDLLIMPEXP_BASE wxHashTable;
+    friend class WXDLLIMPEXP_FWD_BASE wxHashTable;
 public:
     wxHashTable_Node( long key, void* value,
                       wxHashTableBase* table )
@@ -287,7 +286,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)