Fix wxHtmlHelpData::SetTempDir() to behave correctly without trailing slash.
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:
@@ -555,7 +555,7 @@ void AppFrame::CreateMenu ()
|
||||
|
||||
// Help menu
|
||||
wxMenu *menuHelp = new wxMenu;
|
||||
menuHelp->Append (wxID_ABOUT, _("&About ..\tShift+F1"));
|
||||
menuHelp->Append (wxID_ABOUT, _("&About ..\tCtrl+D"));
|
||||
|
||||
// construct menu
|
||||
m_menuBar->Append (menuFile, _("&File"));
|
||||
|
@@ -474,7 +474,8 @@ void wxHtmlHelpData::SetTempDir(const wxString& path)
|
||||
m_tempPath = path;
|
||||
else
|
||||
{
|
||||
wxFileName fn(path);
|
||||
wxFileName fn;
|
||||
fn.AssignDir(path);
|
||||
fn.MakeAbsolute();
|
||||
|
||||
m_tempPath = fn.GetPath(wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR);
|
||||
|
Reference in New Issue
Block a user