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 c56008620eb1bc057f89a4031cfa2d1be0de1453..70385cff71fe95bac1ba70f38ae8edb1fb88dda2 100644 (file)
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -312,9 +312,6 @@ static const char * icon8_xpm[] = {
 "                "};
 
 
-#define wxID_TREECTRL          7000
-#define wxID_FILTERLISTCTRL    7001
-
 #if defined(__DOS__)
 
 bool wxIsDriveAvailable(const wxString& dirName)
@@ -505,7 +502,16 @@ bool wxGenericDirCtrl::Create(wxWindow *parent,
 
     Init();
 
-    long treeStyle = wxTR_HAS_BUTTONS | wxTR_EDIT_LABELS | wxTR_HIDE_ROOT;
+    long treeStyle = wxTR_HAS_BUTTONS;
+
+    if (style & wxDIRCTRL_EDITABLE)
+        treeStyle |= wxTR_EDIT_LABELS;
+
+#ifndef __WXMSW__
+    // FIXME, doesn't work for some reason
+    treeStyle |= wxTR_HIDE_ROOT;
+#endif
+
     if ((style & wxDIRCTRL_3D_INTERNAL) == 0)
         treeStyle |= wxNO_BORDER;
 
@@ -579,7 +585,10 @@ void wxGenericDirCtrl::ShowHidden( bool show )
 {
     m_showHidden = show;
 
-    // reparse FIXME
+    wxString path = GetPath();
+    m_treeCtrl->Collapse(m_treeCtrl->GetRootItem());
+    m_treeCtrl->Expand(m_treeCtrl->GetRootItem());
+    SetPath(path);
 }
 
 void wxGenericDirCtrl::AddSection(const wxString& path, const wxString& name, int imageId)
@@ -1176,6 +1185,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);
         }