AddBook ignores wxMac paths (still won't work)

[wxWidgets.git] / src / generic / helphtml.cpp

diff --git a/src/generic/helphtml.cpp b/src/generic/helphtml.cpp
index f8731d8d17e625b8289ef6aa2c25b59b1c4f209c..1f3f59250fb1044c8e903367600b2f9425a8ba85 100644 (file)
--- a/src/generic/helphtml.cpp
+++ b/src/generic/helphtml.cpp
@@ -166,7 +166,7 @@ wxHTMLHelpControllerBase::LoadFile(const wxString& ifile)
    m_MapList = new wxList;
    m_NumOfEntries = 0;
 
    m_MapList = new wxList;
    m_NumOfEntries = 0;
 

-   FILE *input = fopen(mapFile.fn_str(),"rt");
+   FILE *input = wxFopen(mapFile,wxT("rt"));

    if(! input)
       return FALSE;
    do
    if(! input)
       return FALSE;
    do


@@ -251,6 +251,16 @@ wxHTMLHelpControllerBase::DisplaySection(int sectionNo)
    return FALSE;
 }
 
    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)
 {
 bool
 wxHTMLHelpControllerBase::DisplayBlock(long blockNo)
 {