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
This commit is contained in:
parent
d77604c5a2
commit
eb1d233694
@ -45,6 +45,10 @@
|
|||||||
# include <unistd.h>
|
# include <unistd.h>
|
||||||
#endif
|
#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
|
wxBusyCursor b; // display a busy cursor
|
||||||
|
|
||||||
wxString url;
|
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)
|
if(! m_Frame || m_NewFrameEachTime)
|
||||||
{
|
{
|
||||||
m_Frame = new wxHelpFrame(NULL, -1, m_FrameTitle,
|
m_Frame = new wxHelpFrame(NULL, -1, m_FrameTitle,
|
||||||
|
Loading…
Reference in New Issue
Block a user