Applied patch [ 705663 ] Fix capture mouse bug in wxGrid

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

diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index f57311fce41f7ae6b3a4d0f2919e2fbdb598b9e9..03890efadbee682d48dcd094f3c1eeddc51871e7 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);
 
+        // 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());
@@ -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)
 {
@@ -592,14 +606,12 @@ wxHtmlProcessorList *wxHtmlWindow::m_GlobalProcessors = NULL;
 
 void wxHtmlWindow::CleanUpStatics()
 {
-    delete m_DefaultFilter;
-    m_DefaultFilter = NULL;
+    wxDELETE(m_DefaultFilter);
     m_Filters.DeleteContents(TRUE);
     m_Filters.Clear();
-    delete m_GlobalProcessors;
-    m_GlobalProcessors = NULL;
-    delete s_cur_hand;
-    delete s_cur_arrow;
+    wxDELETE(m_GlobalProcessors);
+    wxDELETE(s_cur_hand);
+    wxDELETE(s_cur_arrow);
 }