diff --git a/include/wx/html/htmlpars.h b/include/wx/html/htmlpars.h
index 045060a4ea..cecb016c3f 100644
--- a/include/wx/html/htmlpars.h
+++ b/include/wx/html/htmlpars.h
@@ -29,7 +29,7 @@ class wxHtmlTextPieces;
class wxHtmlParserState;
WX_DECLARE_HASH_SET_WITH_DECL_PTR(wxHtmlTagHandler*,
- wxPointerHash, wxPointerEqual,
+ ::wxPointerHash, ::wxPointerEqual,
wxHtmlTagHandlersSet,
class WXDLLIMPEXP_HTML);
WX_DECLARE_STRING_HASH_MAP_WITH_DECL(wxHtmlTagHandler*,
diff --git a/interface/wx/hashmap.h b/interface/wx/hashmap.h
index c103e44afa..6364471596 100644
--- a/interface/wx/hashmap.h
+++ b/interface/wx/hashmap.h
@@ -83,8 +83,8 @@
@code
WX_DECLARE_HASH_MAP( int,
wxString,
- wxIntegerHash,
- wxIntegerEqual,
+ ::wxIntegerHash,
+ ::wxIntegerEqual,
MyHash );
// using an user-defined class for keys
@@ -119,8 +119,8 @@
WX_DECLARE_HASH_MAP( MyKey, // type of the keys
SOME_TYPE, // any type you like
- MyKeyHash, // hasher
- MyKeyEqual, // key equality predicate
+ ::MyKeyHash, // hasher
+ ::MyKeyEqual, // key equality predicate
CLASSNAME); // name of the class
@endcode
diff --git a/interface/wx/hashset.h b/interface/wx/hashset.h
index 36469e47e5..a3406431c7 100644
--- a/interface/wx/hashset.h
+++ b/interface/wx/hashset.h
@@ -20,11 +20,11 @@
class MyClass { ... };
// same, with MyClass* keys (only uses pointer equality!)
- WX_DECLARE_HASH_SET( MyClass*, wxPointerHash, wxPointerEqual, MySet1 );
+ WX_DECLARE_HASH_SET( MyClass*, ::wxPointerHash, ::wxPointerEqual, MySet1 );
// same, with int keys
- WX_DECLARE_HASH_SET( int, wxIntegerHash, wxIntegerEqual, MySet2 );
+ WX_DECLARE_HASH_SET( int, ::wxIntegerHash, ::wxIntegerEqual, MySet2 );
// declare a hash set with string keys
- WX_DECLARE_HASH_SET( wxString, wxStringHash, wxStringEqual, MySet3 );
+ WX_DECLARE_HASH_SET( wxString, ::wxStringHash, ::wxStringEqual, MySet3 );
MySet1 h1;
MySet2 h1;
@@ -70,8 +70,8 @@
@code
WX_DECLARE_HASH_SET( int,
- wxIntegerHash,
- wxIntegerEqual,
+ ::wxIntegerHash,
+ ::wxIntegerEqual,
MySet );
// using an user-defined class for keys
@@ -105,8 +105,8 @@
};
WX_DECLARE_HASH_SET( MyKey, // type of the keys
- MyKeyHash, // hasher
- MyKeyEqual, // key equality predicate
+ ::MyKeyHash, // hasher
+ ::MyKeyEqual, // key equality predicate
CLASSNAME); // name of the class
@endcode
diff --git a/src/common/translation.cpp b/src/common/translation.cpp
index ae01cce210..ea6d25955b 100644
--- a/src/common/translation.cpp
+++ b/src/common/translation.cpp
@@ -1440,7 +1440,7 @@ wxString wxTranslations::ChooseLanguageForDomain(const wxString& WXUNUSED(domain
namespace
{
-WX_DECLARE_HASH_SET(wxString, wxStringHash, wxStringEqual,
+WX_DECLARE_HASH_SET(wxString, ::wxStringHash, ::wxStringEqual,
wxLocaleUntranslatedStrings);
}
diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index a1393a0917..37ee7707ee 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -72,7 +72,7 @@ const char wxGridNameStr[] = "grid";
// Required for wxIs... functions
#include
-WX_DECLARE_HASH_SET_WITH_DECL_PTR(int, wxIntegerHash, wxIntegerEqual,
+WX_DECLARE_HASH_SET_WITH_DECL_PTR(int, ::wxIntegerHash, ::wxIntegerEqual,
wxGridFixedIndicesSet, class WXDLLIMPEXP_ADV);
diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp
index 55ae02d4d3..fe712f89d5 100644
--- a/src/xrc/xmlres.cpp
+++ b/src/xrc/xmlres.cpp
@@ -107,7 +107,7 @@ class wxXmlResourceDataRecords : public wxVector
// this is a class so that it can be forward-declared
};
-WX_DECLARE_HASH_SET_PTR(int, wxIntegerHash, wxIntegerEqual, wxHashSetInt);
+WX_DECLARE_HASH_SET_PTR(int, ::wxIntegerHash, ::wxIntegerEqual, wxHashSetInt);
class wxIdRange // Holds data for a particular rangename
{
diff --git a/utils/wxrc/wxrc.cpp b/utils/wxrc/wxrc.cpp
index 1998c76687..d6b9799e92 100644
--- a/utils/wxrc/wxrc.cpp
+++ b/utils/wxrc/wxrc.cpp
@@ -32,7 +32,7 @@
#include "wx/mimetype.h"
#include "wx/vector.h"
-WX_DECLARE_HASH_SET(wxString, wxStringHash, wxStringEqual, StringSet);
+WX_DECLARE_HASH_SET(wxString, ::wxStringHash, ::wxStringEqual, StringSet);
class XRCWidgetData
{