From 6e8aa701e928c338c9adae656813af2b34dd2434 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 25 Nov 2001 14:27:21 +0000
Subject: [PATCH] added wxCHANGE_DIR flag support to wxMSW implementation

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12679 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/msw/filedlg.cpp | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp
index 28faff8a8b..28dbb46507 100644
--- a/src/msw/filedlg.cpp
+++ b/src/msw/filedlg.cpp
@@ -52,6 +52,10 @@
 
 #include "wx/tokenzr.h"
 
+#ifndef OFN_EXPLORER
+    #define OFN_EXPLORER 0x00080000
+#endif
+
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
@@ -242,12 +246,18 @@ int wxFileDialog::ShowModal()
         msw_flags |= OFN_HIDEREADONLY;
     if ( m_dialogStyle & wxFILE_MUST_EXIST )
         msw_flags |= OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST;
+
     if (m_dialogStyle & wxMULTIPLE )
-        msw_flags |=
-#if defined(OFN_EXPLORER)
-        OFN_EXPLORER |
-#endif // OFN_EXPLORER
-        OFN_ALLOWMULTISELECT;
+    {
+        // OFN_EXPLORER must always be specified with OFN_ALLOWMULTISELECT
+        msw_flags |= OFN_EXPLORER | OFN_ALLOWMULTISELECT;
+    }
+
+    // if wxCHANGE_DIR flag is not given we shouldn't change the CWD
+    if ( !(m_dialogStyle & wxCHANGE_DIR) )
+    {
+        msw_flags |= OFN_NOCHANGEDIR;
+    }
 
     OPENFILENAME of;
     wxZeroMemory(of);
-- 
2.45.2