attempt to fix a rare crash which happens when changing the number of columns in...

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

diff --git a/src/msw/dirdlg.cpp b/src/msw/dirdlg.cpp
index 63194ca403c8114f82eb2d051d745213a03c9e65..00f01d719f31f4caaa695f32bf0caad75164365f 100644 (file)
--- 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/dialog.h"
     #include "wx/dirdlg.h"
     #include "wx/log.h"

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

 #endif
 
 #include "wx/msw/private.h"
 #endif
 
 #include "wx/msw/private.h"


@@ -80,14 +81,15 @@ static int CALLBACK BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lp,
 wxDirDialog::wxDirDialog(wxWindow *parent,
                          const wxString& message,
                          const wxString& defaultPath,
 wxDirDialog::wxDirDialog(wxWindow *parent,
                          const wxString& message,
                          const wxString& defaultPath,

-                         long WXUNUSED(style),
+                         long style,

                          const wxPoint& WXUNUSED(pos),
                          const wxSize& WXUNUSED(size),
                          const wxString& WXUNUSED(name))
 {
     m_message = message;
     m_parent = parent;
                          const wxPoint& WXUNUSED(pos),
                          const wxSize& WXUNUSED(size),
                          const wxString& WXUNUSED(name))
 {
     m_message = message;
     m_parent = parent;

-    
+
+    SetStyle(style);

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


@@ -113,6 +115,10 @@ void wxDirDialog::SetPath(const wxString& path)
     }
 }
 
     }
 }
 

+#ifndef BIF_NEWDIALOGSTYLE
+#define BIF_NEWDIALOGSTYLE 0x0040
+#endif
+

 int wxDirDialog::ShowModal()
 {
     wxWindow *parent = GetParent();
 int wxDirDialog::ShowModal()
 {
     wxWindow *parent = GetParent();


@@ -126,6 +132,12 @@ int wxDirDialog::ShowModal()
     bi.lpfn           = BrowseCallbackProc;
     bi.lParam         = (LPARAM)m_path.c_str();    // param for the callback
 
     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 )
     LPITEMIDLIST pidl = SHBrowseForFolder(&bi);
 
     if ( bi.pidlRoot )