Construct paths using wxFileName in wxHTML help.
Use wxFileName instead of more complicated and error-prone manipulations with strings. Closes #12602. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -475,11 +475,10 @@ void wxHtmlHelpData::SetTempDir(const wxString& path)
|
|||||||
m_tempPath = path;
|
m_tempPath = path;
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (wxIsAbsolutePath(path)) m_tempPath = path;
|
wxFileName fn(path);
|
||||||
else m_tempPath = wxGetCwd() + wxT("/") + path;
|
fn.MakeAbsolute();
|
||||||
|
|
||||||
if (m_tempPath[m_tempPath.length() - 1] != wxT('/'))
|
m_tempPath = fn.GetPath(wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR);
|
||||||
m_tempPath << wxT('/');
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user