removed duplicated code from dynlib.h and dynload.h

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

diff --git a/include/wx/cshelp.h b/include/wx/cshelp.h
index ecad164325f7dcaf82548f9c7afc8308b8354b31..31d6e205c309a7bdd37792dd1c197167466e0b00 100644 (file)
--- a/include/wx/cshelp.h
+++ b/include/wx/cshelp.h
@@ -22,6 +22,7 @@
 
 #include "wx/help.h"
 
+#include "wx/hashmap.h"
 #if wxUSE_BMPBUTTON
 #include "wx/bmpbuttn.h"
 #endif
@@ -78,7 +79,7 @@ public:
     void OnContextHelp(wxCommandEvent& event);
 
 private:
-    DECLARE_CLASS(wxContextHelpButton)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxContextHelpButton)
     DECLARE_EVENT_TABLE()
 };
 
@@ -140,6 +141,9 @@ private:
     static wxHelpProvider *ms_helpProvider;
 };
 
+WX_DECLARE_HASH_MAP( long, wxString, wxIntegerHash, wxIntegerEqual,
+                     wxLongToStringHashMap );
+
 // wxSimpleHelpProvider is an implementation of wxHelpProvider which supports
 // only plain text help strings and shows the string associated with the
 // control (if any) in a tooltip
@@ -156,8 +160,8 @@ public:
 protected:
     // we use 2 hashes for storing the help strings associated with windows
     // and the ids
-    wxStringHashTable m_hashWindows,
-                     m_hashIds;
+    wxLongToStringHashMap m_hashWindows,
+                          m_hashIds;
 };
 
 // wxHelpControllerHelpProvider is an implementation of wxHelpProvider which supports