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

wxURI is enough for the basic url operations.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31103 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-12-21 17:20:47 +00:00
parent 1296186133
commit 7e49601492
20 changed files with 16 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/html/winpars.cpp
View File

@@ -257,36 +257,34 @@ wxFSFile *wxHtmlWinParser::OpenURL(wxHtmlURLType type,
{
wxString myfullurl(myurl);
#if wxUSE_URL
// consider url as absolute path first
wxURL current(wxURL::Unescape(myurl));
myfullurl = current.GetURL();
wxURI current(myurl);
myfullurl = current.BuildUnescapedURI();
// if not absolute then ...
if( current.IsReference() )
{
wxString basepath = GetFS()->GetPath();
wxURI base(wxURL::Unescape(basepath));
wxURI base(basepath);
// try to apply base path if valid ...
// ... try to apply base path if valid ...
if( !base.IsReference() )
{
wxURI path(myfullurl);
path.Resolve( base );
myfullurl = path.BuildURI();
myfullurl = path.BuildUnescapedURI();
}
else
{
// ... or force such addition if not included already
if( !current.GetURL().Contains(basepath) )
if( !current.GetPath().Contains(base.GetPath()) )
{
basepath += myurl;
wxURL connected( wxURL::Unescape(basepath) );
myfullurl = connected.GetURL();
wxURI connected( basepath );
myfullurl = connected.BuildUnescapedURI();
}
}
}
#endif
wxString redirect;
status = m_Window->OnOpeningURL(type, myfullurl, &redirect);