new makefile

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

diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index a9a8a03c6b5370767ffb0c73fc8c18f32f59df18..dddbbad58759a6f3897e339740fab024a866fe97 100644 (file)
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -505,9 +505,16 @@ bool wxGenericDirCtrl::Create(wxWindow *parent,
 
     Init();
 
-    long treeStyle = wxTR_HAS_BUTTONS ; // | wxTR_EDIT_LABELS ;
-
+    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
 #ifndef __WXMSW__
+    // FIXME, doesn't work for some reason
     treeStyle |= wxTR_HIDE_ROOT;
 #endif
 
@@ -1184,6 +1191,14 @@ void wxGenericDirCtrl::DoResize()
         wxSize filterSz ;
         if (m_filterListCtrl)
         {
+#ifdef __WXMSW__
+            // For some reason, this is required in order for the
+            // correct control height to always be returned, rather
+            // than the drop-down list height which is sometimes returned.
+            wxSize oldSize = m_filterListCtrl->GetSize();
+            m_filterListCtrl->SetSize(-1, -1, oldSize.x+10, -1, wxSIZE_USE_EXISTING);
+            m_filterListCtrl->SetSize(-1, -1, oldSize.x, -1, wxSIZE_USE_EXISTING);
+#endif
             filterSz = m_filterListCtrl->GetSize();
             sz.y -= (filterSz.y + verticalSpacing);
         }