Applied patch [ 1192917 ] Grids with no row or col headers cause AV under wxGTK

[wxWidgets.git] / src / common / cshelp.cpp

diff --git a/src/common/cshelp.cpp b/src/common/cshelp.cpp
index 360a7f86be4c6f47bd76ddbc3eaec107130f037b..31af18593eccb88fb6c91207a4619f393198d0d6 100644 (file)
--- a/src/common/cshelp.cpp
+++ b/src/common/cshelp.cpp
@@ -352,8 +352,9 @@ void wxSimpleHelpProvider::AddHelp(wxWindowBase *window, const wxString& text)
 
 void wxSimpleHelpProvider::AddHelp(wxWindowID id, const wxString& text)
 {
-    m_hashIds.erase((long)id);
-    m_hashIds[id] = text;
+    wxLongToStringHashMap::key_type key = (wxLongToStringHashMap::key_type)id;
+    m_hashIds.erase(key);
+    m_hashIds[key] = text;
 }
 
 // removes the association
@@ -383,6 +384,8 @@ bool wxSimpleHelpProvider::ShowHelp(wxWindowBase *window)
 
         return true;
     }
+#else
+    wxUnusedVar(window);
 #endif // wxUSE_TIPWINDOW
 
     return false;