Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support backslashes in topics of HTML help files

Browse Source 
HTML help file is a Microsoft format and it makes sense to support backslashes
in the file names used in it.

Closes https://github.com/wxWidgets/wxWidgets/pull/244
This commit is contained in:
X-L0rd
2016-03-03 22:10:36 +01:00
committed by Vadim Zeitlin
parent db70be1a7c
commit d96a25be12
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/html/helpdata.cpp
View File

@@ -229,7 +229,10 @@ bool HP_TagHandler::HandleTag(const wxHtmlTag& tag)
if (m_name.empty() && tag.GetParam(wxT("NAME")) == wxT("Name")) if (m_name.empty() && tag.GetParam(wxT("NAME")) == wxT("Name"))
m_name = tag.GetParam(wxT("VALUE")); m_name = tag.GetParam(wxT("VALUE"));
if (tag.GetParam(wxT("NAME")) == wxT("Local")) if (tag.GetParam(wxT("NAME")) == wxT("Local"))
m_page = tag.GetParam(wxT("VALUE")); {
m_page = tag.GetParam(wxT("VALUE"));
m_page.Replace("\\", "/");
}
if (tag.GetParam(wxT("NAME")) == wxT("ID")) if (tag.GetParam(wxT("NAME")) == wxT("ID"))
tag.GetParamAsInt(wxT("VALUE"), &m_id); tag.GetParamAsInt(wxT("VALUE"), &m_id);
return false; return false;
@@ -683,7 +686,10 @@ bool wxHtmlHelpData::AddBook(const wxString& book)
if (wxStrstr(linebuf, wxT("title=")) == linebuf) if (wxStrstr(linebuf, wxT("title=")) == linebuf)
title = linebuf + wxStrlen(wxT("title=")); title = linebuf + wxStrlen(wxT("title="));
if (wxStrstr(linebuf, wxT("default topic=")) == linebuf) if (wxStrstr(linebuf, wxT("default topic=")) == linebuf)
start = linebuf + wxStrlen(wxT("default topic=")); {
start = linebuf + wxStrlen(wxT("default topic="));
start.Replace("\\", "/");
}
if (wxStrstr(linebuf, wxT("index file=")) == linebuf) if (wxStrstr(linebuf, wxT("index file=")) == linebuf)
index = linebuf + wxStrlen(wxT("index file=")); index = linebuf + wxStrlen(wxT("index file="));
if (wxStrstr(linebuf, wxT("contents file=")) == linebuf) if (wxStrstr(linebuf, wxT("contents file=")) == linebuf)