corrected WXDLLIMPEXP_ declaration for wxEventBlocker: it's part of core, not base

[wxWidgets.git] / src / html / helpdata.cpp

diff --git a/src/html/helpdata.cpp b/src/html/helpdata.cpp
index 65d3da7f4cede4998181823d3936c45473f948c2..ae9917bf28c9f4c52ece056ab9399f8c226803c5 100644 (file)
--- a/src/html/helpdata.cpp
+++ b/src/html/helpdata.cpp
@@ -717,8 +717,7 @@ wxString wxHtmlHelpData::FindPageByName(const wxString& x)
     wxFileSystem fsys;
     wxFSFile *f;
 
-    /* 1. try to open given file: */
-
+    // 1. try to open given file:
     cnt = m_bookRecords.GetCount();
     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++)
     {
         if (m_bookRecords[i].GetTitle() == x)
             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();
     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();
     for (i = 0; i < cnt; i++)
     {
@@ -759,6 +755,13 @@ wxString wxHtmlHelpData::FindPageByName(const wxString& x)
             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;
 }