Fix for breakage with multiple books
This commit is contained in:
@@ -107,6 +107,7 @@ public:
|
|||||||
|
|
||||||
void Resolve(const wxURI& base, int flags = wxURI_STRICT);
|
void Resolve(const wxURI& base, int flags = wxURI_STRICT);
|
||||||
bool IsReference() const;
|
bool IsReference() const;
|
||||||
|
bool IsRelative() const;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void Clear();
|
void Clear();
|
||||||
|
@@ -313,6 +313,17 @@ bool wxURI::IsReference() const
|
|||||||
return !HasScheme() || !HasServer();
|
return !HasScheme() || !HasServer();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// IsRelative
|
||||||
|
//
|
||||||
|
// FIXME: may need refinement
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
bool wxURI::IsRelative() const
|
||||||
|
{
|
||||||
|
return !HasScheme() && !HasServer();
|
||||||
|
}
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
// Parse
|
// Parse
|
||||||
//
|
//
|
||||||
|
@@ -296,7 +296,7 @@ wxFSFile *wxHtmlWinParser::OpenURL(wxHtmlURLType type,
|
|||||||
myfullurl = current.BuildURI();
|
myfullurl = current.BuildURI();
|
||||||
|
|
||||||
// if not absolute then ...
|
// if not absolute then ...
|
||||||
if( current.IsReference() )
|
if( current.IsRelative() )
|
||||||
{
|
{
|
||||||
wxString basepath = GetFS()->GetPath();
|
wxString basepath = GetFS()->GetPath();
|
||||||
wxURI base(basepath);
|
wxURI base(basepath);
|
||||||
|
Reference in New Issue
Block a user