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

merged 2.2 branch

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2000-07-15 19:51:35 +00:00
parent 8a693e6e04
commit f6bcfd974e
1835 changed files with 237729 additions and 67990 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/generic/helphtml.cpp
View File

@@ -166,7 +166,7 @@ wxHTMLHelpControllerBase::LoadFile(const wxString& ifile)
m_MapList = new wxList;
m_NumOfEntries = 0;
FILE *input = fopen(mapFile.fn_str(),"rt");
FILE *input = wxFopen(mapFile.fn_str(),wxT("rt"));
if(! input)
return FALSE;
do
@@ -251,6 +251,16 @@ wxHTMLHelpControllerBase::DisplaySection(int sectionNo)
return FALSE;
}
bool wxHTMLHelpControllerBase::DisplaySection(const wxString& section)
{
bool isFilename = (section.Find(wxT(".htm")) != -1);
if (isFilename)
return DisplayHelp(section);
else
return KeywordSearch(section);
}
bool
wxHTMLHelpControllerBase::DisplayBlock(long blockNo)
{