Use the data scheme to load resources in the WebKitGTK+ implementation, rather than...

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

diff --git a/src/msw/helpchm.cpp b/src/msw/helpchm.cpp
index c991d47a3c5450dc47f33af285feab89dfd5414c..cdb46e21af4f1c7f97d7439eaa40f2ec8673ad08 100644 (file)
--- a/src/msw/helpchm.cpp
+++ b/src/msw/helpchm.cpp
@@ -18,7 +18,7 @@
 
 #if wxUSE_HELP && wxUSE_MS_HTML_HELP
 
 
 #if wxUSE_HELP && wxUSE_MS_HTML_HELP
 

-#include "wx/filefn.h"
+#include "wx/filename.h"

 #include "wx/msw/helpchm.h"
 
 #include "wx/dynload.h"
 #include "wx/msw/helpchm.h"
 
 #include "wx/dynload.h"


@@ -50,7 +50,7 @@ HTMLHELP GetHtmlHelpFunction()
 
     if ( !s_htmlHelp )
     {
 
     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() )
         {
 
         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.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 =
     popup.rcMargins.top =
     popup.rcMargins.left =
     popup.rcMargins.right =


@@ -219,7 +219,7 @@ bool wxCHMHelpController::Quit()
 wxString wxCHMHelpController::GetValidFilename() const
 {
     wxString path, name, ext;
 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())
 
     wxString fullName;
     if (path.IsEmpty())