Add XRC handler for wxCommandLinkButton.

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

diff --git a/include/wx/hashmap.h b/include/wx/hashmap.h
index 8618a211e7ffeb1362678c5a50a5ce9190a68070..252df7885d8950209233befad704369f137d99ec 100644 (file)
--- a/include/wx/hashmap.h
+++ b/include/wx/hashmap.h
@@ -77,7 +77,7 @@ struct WXDLLIMPEXP_BASE _wxHashTable_NodeBase
     _wxHashTable_NodeBase* m_next;
 
 // Cannot do this:
     _wxHashTable_NodeBase* m_next;
 
 // Cannot do this:

-//  DECLARE_NO_COPY_CLASS(_wxHashTable_NodeBase)
+//  wxDECLARE_NO_COPY_CLASS(_wxHashTable_NodeBase);

 // without rewriting the macros, which require a public copy constructor.
 };
 
 // without rewriting the macros, which require a public copy constructor.
 };
 


@@ -671,8 +671,6 @@ public: \
         Node *node = GetOrCreateNode( \
                 CLASSNAME##_wxImplementation_Pair( v.first, v.second ), \
                 created); \
         Node *node = GetOrCreateNode( \
                 CLASSNAME##_wxImplementation_Pair( v.first, v.second ), \
                 created); \

-        if ( !created ) \
-            node->m_value.second = v.second; \

         return Insert_Result(iterator(node, this), created); \
     } \
  \
         return Insert_Result(iterator(node, this), created); \
     } \
  \


@@ -747,5 +745,11 @@ public: \
 WX_DECLARE_HASH_MAP_WITH_DECL( long, long, wxIntegerHash, wxIntegerEqual,
                                wxLongToLongHashMap, class WXDLLIMPEXP_BASE );
 
 WX_DECLARE_HASH_MAP_WITH_DECL( long, long, wxIntegerHash, wxIntegerEqual,
                                wxLongToLongHashMap, class WXDLLIMPEXP_BASE );
 

+WX_DECLARE_STRING_HASH_MAP_WITH_DECL( wxString, wxStringToStringHashMap,
+                                      class WXDLLIMPEXP_BASE );
+
+WX_DECLARE_STRING_HASH_MAP_WITH_DECL( wxUIntPtr, wxStringToNumHashMap,
+                                      class WXDLLIMPEXP_BASE );
+

 
 #endif // _WX_HASHMAP_H_
 
 #endif // _WX_HASHMAP_H_