Fix line indices translation in wxGrid::DoEndDragResizeLine().

[wxWidgets.git] / src / msw / helpchm.cpp

diff --git a/src/msw/helpchm.cpp b/src/msw/helpchm.cpp
index 4f6fedcfe60090f6f4a63188eb92ab5007eed4c9..cdb46e21af4f1c7f97d7439eaa40f2ec8673ad08 100644 (file)
--- a/src/msw/helpchm.cpp
+++ b/src/msw/helpchm.cpp
@@ -18,7 +18,7 @@
 
 #if wxUSE_HELP && wxUSE_MS_HTML_HELP
 
-#include "wx/filefn.h"
+#include "wx/filename.h"
 #include "wx/msw/helpchm.h"
 
 #include "wx/dynload.h"
@@ -50,7 +50,7 @@ HTMLHELP GetHtmlHelpFunction()
 
     if ( !s_htmlHelp )
     {
-        static wxDynamicLibrary s_dllHtmlHelp(_T("HHCTRL.OCX"), wxDL_VERBATIM);
+        static wxDynamicLibrary s_dllHtmlHelp(wxT("HHCTRL.OCX"), wxDL_VERBATIM);
 
         if ( !s_dllHtmlHelp.IsLoaded() )
         {
@@ -156,8 +156,8 @@ wxCHMHelpController::DoDisplayTextPopup(const wxChar *text,
     popup.pszText = text;
     popup.pt.x = pos.x;
     popup.pt.y = pos.y;
-    popup.clrForeground =
-    popup.clrBackground = (COLORREF)-1;
+    popup.clrForeground = ::GetSysColor(COLOR_INFOTEXT);
+    popup.clrBackground = ::GetSysColor(COLOR_INFOBK);
     popup.rcMargins.top =
     popup.rcMargins.left =
     popup.rcMargins.right =
@@ -213,13 +213,13 @@ bool wxCHMHelpController::KeywordSearch(const wxString& k,
 
 bool wxCHMHelpController::Quit()
 {
-    return CallHtmlHelp(NULL, HH_CLOSE_ALL);
+    return CallHtmlHelp(NULL, NULL, HH_CLOSE_ALL);
 }
 
 wxString wxCHMHelpController::GetValidFilename() const
 {
     wxString path, name, ext;
-    wxSplitPath(m_helpFile, &path, &name, &ext);
+    wxFileName::SplitPath(m_helpFile, &path, &name, &ext);
 
     wxString fullName;
     if (path.IsEmpty())