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

Fix wxHtmlHelpData::SetTempDir() to behave correctly without trailing slash.

Browse Source 
The path passed to this function is always a directory, so use
wxFileName::AssignDir() instead of the default constructor of wxFileName which
considers the name to be a name of a file unless it ends with a path separator.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74696 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-08-23 16:37:09 +00:00
parent d58b140b13
commit 0d53638f71
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/stc/stctest.cpp
View File

@@ -555,7 +555,7 @@ void AppFrame::CreateMenu ()
// Help menu // Help menu
wxMenu *menuHelp = new wxMenu; wxMenu *menuHelp = new wxMenu;
menuHelp->Append (wxID_ABOUT, _("&About ..\tShift+F1")); menuHelp->Append (wxID_ABOUT, _("&About ..\tCtrl+D"));
// construct menu // construct menu
m_menuBar->Append (menuFile, _("&File")); m_menuBar->Append (menuFile, _("&File"));

3
src/html/helpdata.cpp
View File

@@ -474,7 +474,8 @@ void wxHtmlHelpData::SetTempDir(const wxString& path)
m_tempPath = path; m_tempPath = path;
else else
{ {
wxFileName fn(path); wxFileName fn;
fn.AssignDir(path);
fn.MakeAbsolute(); fn.MakeAbsolute();
m_tempPath = fn.GetPath(wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR); m_tempPath = fn.GetPath(wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR);