1. added wxHtmlWindow::LoadFile

2. interpret LoadPage's argument as filename if it fails as URL

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18952 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index f57311fce41f7ae6b3a4d0f2919e2fbdb598b9e9..26e0350fc82fe21a11376a31b1917cb149ddab7a 100644 (file)
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -265,6 +265,14 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
 
         f = m_Parser->OpenURL(wxHTML_URL_PAGE, location);
 
 
         f = m_Parser->OpenURL(wxHTML_URL_PAGE, location);
 

+        // try to interpret 'location' as filename instead of URL:
+        if (f == NULL)
+        {
+            wxFileName fn(location);
+            wxString location2 = wxFileSystem::FileNameToURL(fn);
+            f = m_Parser->OpenURL(wxHTML_URL_PAGE, location2);
+        }
+

         if (f == NULL)
         {
             wxLogError(_("Unable to open requested HTML document: %s"), location.c_str());
         if (f == NULL)
         {
             wxLogError(_("Unable to open requested HTML document: %s"), location.c_str());


@@ -345,6 +353,12 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
 }
 
 
 }
 
 

+bool wxHtmlWindow::LoadFile(const wxFileName& filename)
+{
+    wxString url = wxFileSystem::FileNameToURL(filename);
+    return LoadPage(url);
+}
+

 
 bool wxHtmlWindow::ScrollToAnchor(const wxString& anchor)
 {
 
 bool wxHtmlWindow::ScrollToAnchor(const wxString& anchor)
 {