X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e7b0dcd91e29b025de9827f9bb870c4d98208048..6cc687bfee071b5328f9e48d1708795287006bb7:/src/msw/dirdlg.cpp

diff --git a/src/msw/dirdlg.cpp b/src/msw/dirdlg.cpp
index 7e0994ed74..7e4d420847 100644
--- a/src/msw/dirdlg.cpp
+++ b/src/msw/dirdlg.cpp
@@ -85,20 +85,38 @@ wxDirDialog::wxDirDialog(wxWindow *parent,
 {
     m_message = message;
     m_parent = parent;
-    m_path = defaultPath;
+    
+    SetPath(defaultPath);
+}
+
+void wxDirDialog::SetPath(const wxString& path)
+{
+    m_path = path;
 
     // SHBrowseForFolder doesn't like '/'s nor the trailing backslashes
     m_path.Replace(_T("/"), _T("\\"));
-    if ( *m_path.end() == _T('\\') )
+    if ( !m_path.empty() )
     {
-        m_path.erase(m_path.length() - 1);
+        while ( *(m_path.end() - 1) == _T('\\') )
+        {
+            m_path.erase(m_path.length() - 1);
+        }
+
+        // but the root drive should have a trailing slash (again, this is just
+        // the way the native dialog works)
+        if ( *(m_path.end() - 1) == _T(':') )
+        {
+            m_path += _T('\\');
+        }
     }
 }
 
 int wxDirDialog::ShowModal()
 {
+    wxWindow *parent = GetParent();
+
     BROWSEINFO bi;
-    bi.hwndOwner      = m_parent ? GetHwndOf(m_parent) : NULL;
+    bi.hwndOwner      = parent ? GetHwndOf(parent) : NULL;
     bi.pidlRoot       = NULL;
     bi.pszDisplayName = NULL;
     bi.lpszTitle      = m_message.c_str();