docking hint bug fix

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

diff --git a/src/msw/dirdlg.cpp b/src/msw/dirdlg.cpp
index 5f2f111abb6ebd1edf5c4e869b810fcee9ec9740..f379d76255cd5bff362451e9f41bb4656753cbb4 100644 (file)
--- a/src/msw/dirdlg.cpp
+++ b/src/msw/dirdlg.cpp
@@ -26,12 +26,14 @@
 
 #if wxUSE_DIRDLG
 
 
 #if wxUSE_DIRDLG
 

-#if wxUSE_OLE && !defined(__GNUWIN32_OLD__) && (!defined(__WXWINCE__) || (defined(__HANDHELDPC__) && (_WIN32_WCE >= 500)))
+#if wxUSE_OLE && !defined(__GNUWIN32_OLD__) && (!defined(__WXWINCE__) || \
+    (defined(__HANDHELDPC__) && (_WIN32_WCE >= 500)))
+
+#include "wx/dirdlg.h"

 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/dialog.h"
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/dialog.h"

-    #include "wx/dirdlg.h"

     #include "wx/log.h"
     #include "wx/app.h"     // for GetComCtl32Version()
 #endif
     #include "wx/log.h"
     #include "wx/app.h"     // for GetComCtl32Version()
 #endif


@@ -89,7 +91,7 @@ wxDirDialog::wxDirDialog(wxWindow *parent,
     m_message = message;
     m_parent = parent;
 
     m_message = message;
     m_parent = parent;
 

-    SetStyle(style);
+    SetWindowStyle(style);

     SetPath(defaultPath);
 }
 
     SetPath(defaultPath);
 }
 


@@ -147,7 +149,7 @@ int wxDirDialog::ShowModal()
     // is also the only way to have a resizable dialog
     //
     // "new" style is only available in the version 5.0+ of comctl32.dll
     // is also the only way to have a resizable dialog
     //
     // "new" style is only available in the version 5.0+ of comctl32.dll

-    const bool needNewDir = HasFlag(wxDD_NEW_DIR_BUTTON);
+    const bool needNewDir = !HasFlag(wxDD_DIR_MUST_EXIST);

     if ( (needNewDir || HasFlag(wxRESIZE_BORDER)) && (verComCtl32 >= 500) )
     {
         if (needNewDir)
     if ( (needNewDir || HasFlag(wxRESIZE_BORDER)) && (verComCtl32 >= 500) )
     {
         if (needNewDir)


@@ -181,6 +183,10 @@ int wxDirDialog::ShowModal()
 
     m_path = pidl.GetPath();
 
 
     m_path = pidl.GetPath();
 

+    // change current working directory if asked so
+    if (HasFlag(wxDD_CHANGE_DIR))
+        wxSetWorkingDirectory(m_path);
+

     return m_path.empty() ? wxID_CANCEL : wxID_OK;
 }
 
     return m_path.empty() ? wxID_CANCEL : wxID_OK;
 }
 


@@ -243,4 +249,3 @@ BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lp, LPARAM pData)
 #endif // compiler/platform on which the code here compiles
 
 #endif // wxUSE_DIRDLG
 #endif // compiler/platform on which the code here compiles
 
 #endif // wxUSE_DIRDLG

-