fix for the paths with trailing (back)slashes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14876 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/dirdlg.cpp b/src/msw/dirdlg.cpp
index 30d39f5902cbb4e8e969da1d3deb07822cb9862e..7e0994ed74b9176f3c0a6c906bc689c3eb6c2e34 100644 (file)
--- a/src/msw/dirdlg.cpp
+++ b/src/msw/dirdlg.cpp
@@ -28,8 +28,6 @@
     #pragma hdrstop
 #endif
 
-#include "wx/setup.h"
-
 #if wxUSE_DIRDLG
 
 #if defined(__WIN95__) && !defined(__GNUWIN32_OLD__) && wxUSE_OLE
@@ -43,7 +41,7 @@
 
 #include "wx/msw/private.h"
 
-#include "shlobj.h" // Win95 shell
+#include <shlobj.h> // Win95 shell
 
 // ----------------------------------------------------------------------------
 // constants
@@ -88,7 +86,13 @@ wxDirDialog::wxDirDialog(wxWindow *parent,
     m_message = message;
     m_parent = parent;
     m_path = defaultPath;
-    m_path.Replace(_T("/"), _T("\\")); // SHBrowseForFolder doesn't like '/'s
+
+    // SHBrowseForFolder doesn't like '/'s nor the trailing backslashes
+    m_path.Replace(_T("/"), _T("\\"));
+    if ( *m_path.end() == _T('\\') )
+    {
+        m_path.erase(m_path.length() - 1);
+    }
 }
 
 int wxDirDialog::ShowModal()