bridged mapfile native path to filesys url paths for mac

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/helpwxht.cpp b/src/generic/helpwxht.cpp
index 7b3a9c9d70b7bf154ec27fee2f71ea51b8cc25b3..e18bb0e386cb3e4ef39bc443d1a52b232f4979a3 100644 (file)
--- a/src/generic/helpwxht.cpp
+++ b/src/generic/helpwxht.cpp
@@ -45,6 +45,10 @@
 #   include   <unistd.h>
 #endif
 
 #   include   <unistd.h>
 #endif
 

+#ifdef __WXMAC__
+    #include "wx/mac/private.h"
+#endif
+

 IMPLEMENT_CLASS(wxHelpControllerHtml, wxHTMLHelpControllerBase)
 
 /**
 IMPLEMENT_CLASS(wxHelpControllerHtml, wxHTMLHelpControllerBase)
 
 /**


@@ -272,7 +276,11 @@ wxHelpControllerHtml::DisplayHelp(const wxString &relativeURL)
    wxBusyCursor b; // display a busy cursor
 
    wxString url;
    wxBusyCursor b; // display a busy cursor
 
    wxString url;

-   url << m_MapFile << SEP<< relativeURL;
+   wxString mapfileurl = m_MapFile ;
+#ifdef __WXMAC__
+    mapfileurl = wxMac2UnixFilename(m_MapFile) ;
+#endif
+   url << mapfileurl << SEP<< relativeURL;

    if(! m_Frame || m_NewFrameEachTime)
    {
       m_Frame = new wxHelpFrame(NULL, -1, m_FrameTitle,
    if(! m_Frame || m_NewFrameEachTime)
    {
       m_Frame = new wxHelpFrame(NULL, -1, m_FrameTitle,