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

1. added wxHtmlWindow::LoadFile

Browse Source 
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
This commit is contained in:
Václav Slavík
2003-01-26 23:19:46 +00:00
parent 2f5b93fb9f
commit 7cb9cf8992
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/html/htmlwin.cpp
View File

@@ -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) if (f == NULL)
{ {
wxLogError(_("Unable to open requested HTML document: %s"), location.c_str()); 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)
{ {