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

Added showing the default URL in DisplayContents and DisplayIndex

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9903 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2001-04-27 15:04:57 +00:00
parent b6c8bd6959
commit 71d04f7ffd
4 changed files with 42 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/html/helpdata.cpp
View File

@@ -766,10 +766,10 @@ wxString wxHtmlHelpData::FindPageByName(const wxString& x)
cnt = m_BookRecords.GetCount();
for (i = 0; i < cnt; i++)
{
f = fsys.OpenFile(m_BookRecords[i].GetBasePath() + x);
f = fsys.OpenFile(wxAddBasePath(m_BookRecords[i].GetBasePath(), x));
if (f)
{
url = m_BookRecords[i].GetBasePath() + x;
url = wxAddBasePath(m_BookRecords[i].GetBasePath(), x);
delete f;
return url;
}
@@ -782,7 +782,7 @@ wxString wxHtmlHelpData::FindPageByName(const wxString& x)
{
if (m_BookRecords[i].GetTitle() == x)
{
url = m_BookRecords[i].GetBasePath() + m_BookRecords[i].GetStart();
url = wxAddBasePath(m_BookRecords[i].GetBasePath(), m_BookRecords[i].GetStart());
return url;
}
}
@@ -794,7 +794,7 @@ wxString wxHtmlHelpData::FindPageByName(const wxString& x)
{
if (wxStrcmp(m_Contents[i].m_Name, x) == 0)
{
url = m_Contents[i].m_Book->GetBasePath() + m_Contents[i].m_Page;
url = wxAddBasePath(m_Contents[i].m_Book->GetBasePath(), m_Contents[i].m_Page);
return url;
}
}
@@ -807,7 +807,7 @@ wxString wxHtmlHelpData::FindPageByName(const wxString& x)
{
if (wxStrcmp(m_Index[i].m_Name, x) == 0)
{
url = m_Index[i].m_Book->GetBasePath() + m_Index[i].m_Page;
url = wxAddBasePath(m_Index[i].m_Book->GetBasePath(), m_Index[i].m_Page);
return url;
}
}
@@ -824,7 +824,7 @@ wxString wxHtmlHelpData::FindPageById(int id)
{
if (m_Contents[i].m_ID == id)
{
url = m_Contents[i].m_Book->GetBasePath() + m_Contents[i].m_Page;
url = wxAddBasePath(m_Contents[i].m_Book->GetBasePath(), m_Contents[i].m_Page);
return url;
}
}
@@ -903,7 +903,7 @@ bool wxHtmlSearchStatus::Search()
else m_LastPage = thepage;
wxFileSystem fsys;
file = fsys.OpenFile(m_Data->m_Contents[i].m_Book->GetBasePath() + thepage);
file = fsys.OpenFile(wxAddBasePath(m_Data->m_Contents[i].m_Book->GetBasePath(), thepage));
if (file)
{
if (m_Engine.Scan(file->GetStream())) {
@@ -990,6 +990,14 @@ bool wxSearchEngine::Scan(wxInputStream *stream)
return found;
}
// Utility function
wxString wxAddBasePath(const wxString& basePath, const wxString& path)
{
if (wxIsAbsolutePath(path))
return path;
else
return basePath + path;
}