synchronize GTK2 minimum version in docs

[wxWidgets.git] / interface / wx / hashmap.h

diff --git a/interface/wx/hashmap.h b/interface/wx/hashmap.h
index 4b4dda022559bfdba6fe7d4c79950fbccd63a12b..b7554e815b87e7f3b805cbbe0658c2c97783b17b 100644 (file)
--- a/interface/wx/hashmap.h
+++ b/interface/wx/hashmap.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxHashMap
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxHashMap
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /**
 /////////////////////////////////////////////////////////////////////////////
 
 /**


@@ -11,7 +11,7 @@
 
     This is a simple, type-safe, and reasonably efficient hash map class,
     whose interface is a subset of the interface of STL containers.
 
     This is a simple, type-safe, and reasonably efficient hash map class,
     whose interface is a subset of the interface of STL containers.

-    In particular, the interface is modeled after std::map, and the various,
+    In particular, the interface is modelled after std::map, and the various,

     non-standard, std::hash_map (http://www.cppreference.com/wiki/stl/map/start).
 
     Example:
     non-standard, std::hash_map (http://www.cppreference.com/wiki/stl/map/start).
 
     Example:


@@ -83,8 +83,8 @@
     @code
     WX_DECLARE_HASH_MAP( int,
                          wxString,
     @code
     WX_DECLARE_HASH_MAP( int,
                          wxString,

-                         wxIntegerHash,
-                         wxIntegerEqual,
+                         ::wxIntegerHash,
+                         ::wxIntegerEqual,

                          MyHash );
 
     // using an user-defined class for keys
                          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
 
     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
 
                          CLASSNAME); // name of the class
     @endcode
 


@@ -228,7 +228,8 @@ public:
     /**
         If an element with the given key is present, the functions returns an
         iterator pointing at that element, otherwise an invalid iterator is
     /**
         If an element with the given key is present, the functions returns an
         iterator pointing at that element, otherwise an invalid iterator is

-        returned; i.e.
+        returned.
+

         @code
             hashmap.find( non_existent_key ) == hashmap.end()
         @endcode
         @code
             hashmap.find( non_existent_key ) == hashmap.end()
         @endcode