Updates to match recent CVS changes.

[wxWidgets.git] / src / generic / dirctrlg.cpp

diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index 6084a44bd23c88958c70ee91de0f4cf906ac6314..70385cff71fe95bac1ba70f38ae8edb1fb88dda2 100644 (file)
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -503,13 +503,10 @@ bool wxGenericDirCtrl::Create(wxWindow *parent,
     Init();
 
     long treeStyle = wxTR_HAS_BUTTONS;
-#ifdef __WXMSW__
-    // VS: Do **NOT** remove this style, ever. MSW native wxTreeCtrl::EditLabel doesn't 
-    //     work without this style and we need it to be able to create new directories.
-    //     Generic wxTreeCtrl can do it even w/o wxTR_EDIT_LABELS, so we only add it
-    //     in case of wxMSW (as it is arguably better to not have the style enabled)
-    treeStyle |= wxTR_EDIT_LABELS;
-#endif
+
+    if (style & wxDIRCTRL_EDITABLE)
+        treeStyle |= wxTR_EDIT_LABELS;
+
 #ifndef __WXMSW__
     // FIXME, doesn't work for some reason
     treeStyle |= wxTR_HIDE_ROOT;