X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bc850f29e6513d10d7dba66996adaf66ba64ab77..479101cac1fdca97a3c130ee05a7ff4ebe177edf:/include/wx/hashmap.h

diff --git a/include/wx/hashmap.h b/include/wx/hashmap.h
index 1715c403f8..801a036140 100644
--- a/include/wx/hashmap.h
+++ b/include/wx/hashmap.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        hashmap.cpp
+// Name:        hashmap.h
 // Purpose:     wxHashMap class
 // Author:      Mattia Barbon
 // Modified by:
@@ -16,7 +16,7 @@
 #pragma interface "hashmap.h"
 #endif
 
-#include <wx/string.h>
+#include "wx/string.h"
 
 // private
 struct WXDLLEXPORT _wxHashTable_NodeBase
@@ -363,9 +363,15 @@ public: \
 #define _WX_DECLARE_HASH_MAP_KEY_EX( KEY_T, PAIR_T, CLASSNAME, CLASSEXP ) \
 CLASSEXP CLASSNAME \
 { \
+    typedef KEY_T key_type; \
+    typedef PAIR_T pair_type; \
+    typedef const key_type const_key_type; \
+    typedef const pair_type const_pair_type; \
+    typedef const_key_type& const_key_reference; \
+    typedef const_pair_type& const_pair_reference; \
 public: \
     CLASSNAME() { } \
-    KEY_T operator()( PAIR_T pair ) const { return pair.first; } \
+    const_key_reference operator()( const_pair_reference pair ) const { return pair.first; }\
     \
     /* the dummy assignment operator is needed to suppress compiler */ \
     /* warnings from hash table class' operator=(): gcc complains about */ \