X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f3558accb076d310af4590fdd8382892d5c3c653..229653c99e1d679aab15772a4a25909ca52c4d94:/src/msw/dirdlg.cpp

diff --git a/src/msw/dirdlg.cpp b/src/msw/dirdlg.cpp
index 0b8885ffd9..00f01d719f 100644
--- a/src/msw/dirdlg.cpp
+++ b/src/msw/dirdlg.cpp
@@ -37,6 +37,7 @@
     #include "wx/dialog.h"
     #include "wx/dirdlg.h"
     #include "wx/log.h"
+    #include "wx/app.h"     // for GetComCtl32Version()
 #endif
 
 #include "wx/msw/private.h"
@@ -80,12 +81,15 @@ static int CALLBACK BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lp,
 wxDirDialog::wxDirDialog(wxWindow *parent,
                          const wxString& message,
                          const wxString& defaultPath,
-                         long WXUNUSED(style),
-                         const wxPoint& WXUNUSED(pos))
+                         long style,
+                         const wxPoint& WXUNUSED(pos),
+                         const wxSize& WXUNUSED(size),
+                         const wxString& WXUNUSED(name))
 {
     m_message = message;
     m_parent = parent;
-    
+
+    SetStyle(style);
     SetPath(defaultPath);
 }
 
@@ -99,18 +103,22 @@ void wxDirDialog::SetPath(const wxString& path)
     {
         while ( *(m_path.end() - 1) == _T('\\') )
         {
-            size_t len = m_path.length();
-            if ( len == 1 )
-            {
-                // leave '/' alone
-                break;
-            }
+            m_path.erase(m_path.length() - 1);
+        }
 
-            m_path.erase(len - 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('\\');
         }
     }
 }
 
+#ifndef BIF_NEWDIALOGSTYLE
+#define BIF_NEWDIALOGSTYLE 0x0040
+#endif
+
 int wxDirDialog::ShowModal()
 {
     wxWindow *parent = GetParent();
@@ -124,6 +132,12 @@ int wxDirDialog::ShowModal()
     bi.lpfn           = BrowseCallbackProc;
     bi.lParam         = (LPARAM)m_path.c_str();    // param for the callback
 
+    if ((GetStyle() & wxDD_NEW_DIR_BUTTON) &&
+        (wxApp::GetComCtl32Version() >= 500))
+    {
+        bi.ulFlags |= BIF_NEWDIALOGSTYLE;
+    }
+
     LPITEMIDLIST pidl = SHBrowseForFolder(&bi);
 
     if ( bi.pidlRoot )