info about removal of wxhtml.rc

[wxWidgets.git] / src / msw / dirdlg.cpp

diff --git a/src/msw/dirdlg.cpp b/src/msw/dirdlg.cpp
index 30d39f5902cbb4e8e969da1d3deb07822cb9862e..0b8885ffd9143af080111b86f4a9bf2f9d305ba5 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
@@ -87,14 +85,38 @@ wxDirDialog::wxDirDialog(wxWindow *parent,
 {
     m_message = message;
     m_parent = parent;
-    m_path = defaultPath;
-    m_path.Replace(_T("/"), _T("\\")); // SHBrowseForFolder doesn't like '/'s
+    
+    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.empty() )
+    {
+        while ( *(m_path.end() - 1) == _T('\\') )
+        {
+            size_t len = m_path.length();
+            if ( len == 1 )
+            {
+                // leave '/' alone
+                break;
+            }
+
+            m_path.erase(len - 1);
+        }
+    }
 }
 
 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();