From 871192ce0f40bdcbdc89ecdd4029cf7934f6be02 Mon Sep 17 00:00:00 2001 From: Michael Wetherell Date: Mon, 17 Oct 2005 22:11:49 +0000 Subject: [PATCH] Widen the hash key for win64 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35922 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/cshelp.h | 8 ++++---- src/common/cshelp.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/wx/cshelp.h b/include/wx/cshelp.h index 0789c32693..7f85910dd7 100644 --- a/include/wx/cshelp.h +++ b/include/wx/cshelp.h @@ -137,8 +137,8 @@ private: static wxHelpProvider *ms_helpProvider; }; -WX_DECLARE_EXPORTED_HASH_MAP( long, wxString, wxIntegerHash, wxIntegerEqual, - wxLongToStringHashMap ); +WX_DECLARE_EXPORTED_HASH_MAP( wxUIntPtr, wxString, wxIntegerHash, + wxIntegerEqual, wxSimpleHelpProviderHashMap ); // wxSimpleHelpProvider is an implementation of wxHelpProvider which supports // only plain text help strings and shows the string associated with the @@ -156,8 +156,8 @@ public: protected: // we use 2 hashes for storing the help strings associated with windows // and the ids - wxLongToStringHashMap m_hashWindows, - m_hashIds; + wxSimpleHelpProviderHashMap m_hashWindows, + m_hashIds; }; // wxHelpControllerHelpProvider is an implementation of wxHelpProvider which supports diff --git a/src/common/cshelp.cpp b/src/common/cshelp.cpp index 7e4d11a93b..ae2a282c3a 100644 --- a/src/common/cshelp.cpp +++ b/src/common/cshelp.cpp @@ -334,7 +334,7 @@ wxHelpProvider::~wxHelpProvider() wxString wxSimpleHelpProvider::GetHelp(const wxWindowBase *window) { - wxLongToStringHashMap::iterator it = m_hashWindows.find(WINHASH_KEY(window)); + wxSimpleHelpProviderHashMap::iterator it = m_hashWindows.find(WINHASH_KEY(window)); if ( it == m_hashWindows.end() ) { @@ -354,7 +354,7 @@ void wxSimpleHelpProvider::AddHelp(wxWindowBase *window, const wxString& text) void wxSimpleHelpProvider::AddHelp(wxWindowID id, const wxString& text) { - wxLongToStringHashMap::key_type key = (wxLongToStringHashMap::key_type)id; + wxSimpleHelpProviderHashMap::key_type key = (wxSimpleHelpProviderHashMap::key_type)id; m_hashIds.erase(key); m_hashIds[key] = text; } -- 2.47.2