look in codeset-specific directory for locale files first, then fallback to the one...

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

diff --git a/src/common/cshelp.cpp b/src/common/cshelp.cpp
index 360a7f86be4c6f47bd76ddbc3eaec107130f037b..b8d7e4b7b2a17d4b85d8bad9a02ab2129a0085b4 100644 (file)
--- a/src/common/cshelp.cpp
+++ b/src/common/cshelp.cpp
@@ -254,6 +254,8 @@ bool wxContextHelp::DispatchEvent(wxWindow* win, const wxPoint& pt)
  * to put the application into context help mode.
  */
 
+#ifndef __WXPM__
+
 static const char * csquery_xpm[] = {
 "12 11 2 1",
 "  c None",
@@ -270,6 +272,8 @@ static const char * csquery_xpm[] = {
 "     ..     ",
 "            "};
 
+#endif
+
 IMPLEMENT_CLASS(wxContextHelpButton, wxBitmapButton)
 
 BEGIN_EVENT_TABLE(wxContextHelpButton, wxBitmapButton)
@@ -352,8 +356,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 +388,8 @@ bool wxSimpleHelpProvider::ShowHelp(wxWindowBase *window)
 
         return true;
     }
+#else
+    wxUnusedVar(window);
 #endif // wxUSE_TIPWINDOW
 
     return false;