AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Construct paths using wxFileName in wxHTML help.

Browse Source 
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:
Vadim Zeitlin 2010-10-23 14:10:05 +00:00
parent 7f75598947
commit ec2c85bf79
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/html/helpdata.cpp
View File

@ -475,11 +475,10 @@ void wxHtmlHelpData::SetTempDir(const wxString& path)
m_tempPath = path;
else
{
if (wxIsAbsolutePath(path)) m_tempPath = path;
else m_tempPath = wxGetCwd() + wxT("/") + path;
wxFileName fn(path);
fn.MakeAbsolute();
if (m_tempPath[m_tempPath.length() - 1] != wxT('/'))
m_tempPath << wxT('/');
m_tempPath = fn.GetPath(wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR);
}
}