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

search in the index case-insensitively in FindPageByName() if all else fails (replaces patch 1227882)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42675 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-10-29 21:29:49 +00:00
parent c348a710f0
commit 735a74df5c
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/html/helpdata.cpp
View File

@@ -717,8 +717,7 @@ wxString wxHtmlHelpData::FindPageByName(const wxString& x)
wxFileSystem fsys; wxFileSystem fsys;
wxFSFile *f; wxFSFile *f;
/* 1. try to open given file: */ // 1. try to open given file:
cnt = m_bookRecords.GetCount(); cnt = m_bookRecords.GetCount();
for (i = 0; i < cnt; i++) for (i = 0; i < cnt; i++)
{ {
@@ -732,16 +731,14 @@ wxString wxHtmlHelpData::FindPageByName(const wxString& x)
} }
/* 2. try to find a book: */ // 2. try to find a book:
for (i = 0; i < cnt; i++) for (i = 0; i < cnt; i++)
{ {
if (m_bookRecords[i].GetTitle() == x) if (m_bookRecords[i].GetTitle() == x)
return m_bookRecords[i].GetFullPath(m_bookRecords[i].GetStart()); return m_bookRecords[i].GetFullPath(m_bookRecords[i].GetStart());
} }
/* 3. try to find in contents: */ // 3. try to find in contents:
cnt = m_contents.size(); cnt = m_contents.size();
for (i = 0; i < cnt; i++) for (i = 0; i < cnt; i++)
{ {
@@ -750,8 +747,7 @@ wxString wxHtmlHelpData::FindPageByName(const wxString& x)
} }
/* 4. try to find in index: */ // 4. try to find in index:
cnt = m_index.size(); cnt = m_index.size();
for (i = 0; i < cnt; i++) for (i = 0; i < cnt; i++)
{ {
@@ -759,6 +755,13 @@ wxString wxHtmlHelpData::FindPageByName(const wxString& x)
return m_index[i].GetFullPath(); return m_index[i].GetFullPath();
} }
// 4b. if still not found, try case-insensitive comparison
for (i = 0; i < cnt; i++)
{
if (m_index[i].name.CmpNoCase(x) == 0)
return m_index[i].GetFullPath();
}
return wxEmptyString; return wxEmptyString;
} }