Fix for breakage with multiple books
This commit is contained in:
parent
ab95207c78
commit
78fe0ac3d8
3 changed files with 13 additions and 1 deletions
|
|
@ -107,6 +107,7 @@ public:
|
|||
|
||||
void Resolve(const wxURI& base, int flags = wxURI_STRICT);
|
||||
bool IsReference() const;
|
||||
bool IsRelative() const;
|
||||
|
||||
protected:
|
||||
void Clear();
|
||||
|
|
|
|||
|
|
@ -313,6 +313,17 @@ bool wxURI::IsReference() const
|
|||
return !HasScheme() || !HasServer();
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// IsRelative
|
||||
//
|
||||
// FIXME: may need refinement
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
bool wxURI::IsRelative() const
|
||||
{
|
||||
return !HasScheme() && !HasServer();
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Parse
|
||||
//
|
||||
|
|
|
|||
|
|
@ -296,7 +296,7 @@ wxFSFile *wxHtmlWinParser::OpenURL(wxHtmlURLType type,
|
|||
myfullurl = current.BuildURI();
|
||||
|
||||
// if not absolute then ...
|
||||
if( current.IsReference() )
|
||||
if( current.IsRelative() )
|
||||
{
|
||||
wxString basepath = GetFS()->GetPath();
|
||||
wxURI base(basepath);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue