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

Send full url to wxHtmlWindow::OnOpeningURL validation (and therefore use wxURL to not duplicate code). Present it in statusbar of samples/html/test application.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31033 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-12-16 20:32:43 +00:00
parent ea4daac45c
commit 4bfa318965
21 changed files with 79 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/html/winpars.cpp
View File

@@ -32,6 +32,7 @@
#include "wx/fontmap.h"
#include "wx/log.h"
#include "wx/settings.h"
#include "wx/url.h"
//-----------------------------------------------------------------------------
@@ -248,16 +249,47 @@ wxObject* wxHtmlWinParser::GetProduct()
wxFSFile *wxHtmlWinParser::OpenURL(wxHtmlURLType type,
const wxString& url) const
{
// FIXME - normalize the URL to full path before passing to
// OnOpeningURL!!
if ( m_Window )
{
wxString myurl(url);
wxHtmlOpeningStatus status;
for (;;)
{
wxString myfullurl(myurl);
#if wxUSE_URL
// consider url as absolute path first
wxURL current(wxURL::Unescape(myurl));
myfullurl = current.GetURL();
// if not absolute then ...
if( current.IsReference() )
{
wxString basepath = GetFS()->GetPath();
wxURI base(wxURL::Unescape(basepath));
// try to apply base path if valid ...
if( !base.IsReference() )
{
wxURI path(myfullurl);
path.Resolve( base );
myfullurl = path.BuildURI();
}
else
{
// ... or force such addition if not included already
if( !current.GetURL().Contains(basepath) )
{
basepath += myurl;
wxURL connected( wxURL::Unescape(basepath) );
myfullurl = connected.GetURL();
}
}
}
#endif
wxString redirect;
status = m_Window->OnOpeningURL(type, myurl, &redirect);
status = m_Window->OnOpeningURL(type, myfullurl, &redirect);
if ( status != wxHTML_REDIRECT )
break;