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

diff --git a/samples/stc/stctest.cpp b/samples/stc/stctest.cpp
index ab2dcea8483f1098ecfcd084a2d255423d7a5641..b42bda52d8bd906170760b39674ca263f6da971a 100644 (file)
--- a/samples/stc/stctest.cpp
+++ b/samples/stc/stctest.cpp
@@ -555,7 +555,7 @@ void AppFrame::CreateMenu ()
 
     // Help menu
     wxMenu *menuHelp = new wxMenu;
 
     // 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"));
 
     // construct menu
     m_menuBar->Append (menuFile, _("&File"));

diff --git a/src/html/helpdata.cpp b/src/html/helpdata.cpp
index 6db3bc5c65acfed2285563d501168b2d206a6d1f..c60c74e626c8783ab3eb8e5c7b88dc7847a5b088 100644 (file)
--- a/src/html/helpdata.cpp
+++ b/src/html/helpdata.cpp
@@ -474,7 +474,8 @@ void wxHtmlHelpData::SetTempDir(const wxString& path)
         m_tempPath = path;
     else
     {
         m_tempPath = path;
     else
     {

-        wxFileName fn(path);
+        wxFileName fn;
+        fn.AssignDir(path);

         fn.MakeAbsolute();
 
         m_tempPath = fn.GetPath(wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR);
         fn.MakeAbsolute();
 
         m_tempPath = fn.GetPath(wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR);