X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e13ea14e3012e1a4091f5bd264d7f71444792f46..7948c0c24401c496c04da3c28f1f1f2f282ba327:/src/generic/dirdlgg.cpp

diff --git a/src/generic/dirdlgg.cpp b/src/generic/dirdlgg.cpp
index da8b9a8759..2900942781 100644
--- a/src/generic/dirdlgg.cpp
+++ b/src/generic/dirdlgg.cpp
@@ -36,7 +36,7 @@
 #endif
 
 #include "wx/statline.h"
-#include "wx/generic/dirctrlg.h"
+#include "wx/dirctrl.h"
 #include "wx/generic/dirdlgg.h"
 #include "wx/artprov.h"
 #include "wx/bmpbuttn.h"
@@ -93,14 +93,19 @@ wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title,
     
     // I'm not convinced we need a New button, and we tend to get annoying
     // accidental-editing with label editing enabled.
-    wxBitmapButton* newButton = 
-        new wxBitmapButton(this, ID_NEW,
-                           wxArtProvider::GetBitmap(wxART_NEW_DIR, wxART_CMN_DIALOG));
-    buttonsizer->Add( newButton, 0, wxRIGHT, 10 );
+    if (style & wxDD_NEW_DIR_BUTTON)
+    {
+        wxBitmapButton* newButton = 
+            new wxBitmapButton(this, ID_NEW,
+                            wxArtProvider::GetBitmap(wxART_NEW_DIR, wxART_CMN_DIALOG));
+        buttonsizer->Add( newButton, 0, wxRIGHT, 10 );
+#if wxUSE_TOOLTIPS
+        newButton->SetToolTip(_("Create new directory"));
+#endif    
+    }
 
 #if wxUSE_TOOLTIPS
     homeButton->SetToolTip(_("Go to home directory"));
-    newButton->SetToolTip(_("Create new directory"));
 #endif
 
     topsizer->Add( buttonsizer, 0, wxTOP | wxALIGN_RIGHT, 10 );
@@ -108,10 +113,21 @@ wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title,
     // 1) dir ctrl
     m_dirCtrl = NULL; // this is neccessary, event handler called from 
                       // wxGenericDirCtrl would crash otherwise!
+    long dirStyle = wxDIRCTRL_DIR_ONLY|wxSUNKEN_BORDER;
+    
+#ifdef __WXMSW__
+    if (style & wxDD_NEW_DIR_BUTTON)
+    {
+        // Only under Windows do we need the wxTR_EDIT_LABEL tree control style
+        // before we can call EditLabel (required for "New directory")
+        dirStyle |= wxDIRCTRL_EDIT_LABELS;
+    }
+#endif    
+
     m_dirCtrl = new wxGenericDirCtrl(this, ID_DIRCTRL,
                                      m_path, wxPoint(5, 5),
                                      wxSize(300, 200), 
-                                     wxDIRCTRL_DIR_ONLY|wxSUNKEN_BORDER);
+                                     dirStyle);
 
     topsizer->Add( m_dirCtrl, 1, wxTOP|wxLEFT|wxRIGHT | wxEXPAND, 10 );