Widen the hash key for win64
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35922 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -137,8 +137,8 @@ private:
|
|||||||
static wxHelpProvider *ms_helpProvider;
|
static wxHelpProvider *ms_helpProvider;
|
||||||
};
|
};
|
||||||
|
|
||||||
WX_DECLARE_EXPORTED_HASH_MAP( long, wxString, wxIntegerHash, wxIntegerEqual,
|
WX_DECLARE_EXPORTED_HASH_MAP( wxUIntPtr, wxString, wxIntegerHash,
|
||||||
wxLongToStringHashMap );
|
wxIntegerEqual, wxSimpleHelpProviderHashMap );
|
||||||
|
|
||||||
// wxSimpleHelpProvider is an implementation of wxHelpProvider which supports
|
// wxSimpleHelpProvider is an implementation of wxHelpProvider which supports
|
||||||
// only plain text help strings and shows the string associated with the
|
// only plain text help strings and shows the string associated with the
|
||||||
@@ -156,8 +156,8 @@ public:
|
|||||||
protected:
|
protected:
|
||||||
// we use 2 hashes for storing the help strings associated with windows
|
// we use 2 hashes for storing the help strings associated with windows
|
||||||
// and the ids
|
// and the ids
|
||||||
wxLongToStringHashMap m_hashWindows,
|
wxSimpleHelpProviderHashMap m_hashWindows,
|
||||||
m_hashIds;
|
m_hashIds;
|
||||||
};
|
};
|
||||||
|
|
||||||
// wxHelpControllerHelpProvider is an implementation of wxHelpProvider which supports
|
// wxHelpControllerHelpProvider is an implementation of wxHelpProvider which supports
|
||||||
|
@@ -334,7 +334,7 @@ wxHelpProvider::~wxHelpProvider()
|
|||||||
|
|
||||||
wxString wxSimpleHelpProvider::GetHelp(const wxWindowBase *window)
|
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() )
|
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)
|
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.erase(key);
|
||||||
m_hashIds[key] = text;
|
m_hashIds[key] = text;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user