cleanup code

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

diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index a9a8a03c6b5370767ffb0c73fc8c18f32f59df18..38c948fc2c045878e3a20fd931e7de68f7ee31dd 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,11 +502,10 @@ bool wxGenericDirCtrl::Create(wxWindow *parent,
 
     Init();
 
-    long treeStyle = wxTR_HAS_BUTTONS ; // | wxTR_EDIT_LABELS ;
+    long treeStyle = wxTR_HAS_BUTTONS | wxTR_HIDE_ROOT;
 
-#ifndef __WXMSW__
-    treeStyle |= wxTR_HIDE_ROOT;
-#endif
+    if (style & wxDIRCTRL_EDIT_LABELS)
+        treeStyle |= wxTR_EDIT_LABELS;
 
     if ((style & wxDIRCTRL_3D_INTERNAL) == 0)
         treeStyle |= wxNO_BORDER;
@@ -555,7 +551,7 @@ bool wxGenericDirCtrl::Create(wxWindow *parent,
 
     m_rootId = m_treeCtrl->AddRoot( rootName, 3, -1, rootData);
     m_treeCtrl->SetItemHasChildren(m_rootId);
-    m_treeCtrl->Expand(m_rootId); // automatically expand first level
+    ExpandDir(m_rootId); // automatically expand first level
 
     // Expand and select the default path
     if (!m_defaultPath.IsEmpty())
@@ -585,8 +581,7 @@ void wxGenericDirCtrl::ShowHidden( bool show )
     m_showHidden = show;
 
     wxString path = GetPath();
-    m_treeCtrl->Collapse(m_treeCtrl->GetRootItem());
-    m_treeCtrl->Expand(m_treeCtrl->GetRootItem());
+    ReCreateTree();
     SetPath(path);
 }
 
@@ -753,9 +748,14 @@ void wxGenericDirCtrl::OnExpandItem(wxTreeEvent &event)
 
 void wxGenericDirCtrl::OnCollapseItem(wxTreeEvent &event )
 {
-    wxTreeItemId child, parent = event.GetItem();
+    CollapseDir(event.GetItem());
+}
+
+void wxGenericDirCtrl::CollapseDir(wxTreeItemId parentId)
+{
+    wxTreeItemId child;
 
-    wxDirItemData *data = (wxDirItemData *) m_treeCtrl->GetItemData(event.GetItem());
+    wxDirItemData *data = (wxDirItemData *) m_treeCtrl->GetItemData(parentId);
     if (!data->m_isExpanded)
         return;
 
@@ -763,13 +763,13 @@ void wxGenericDirCtrl::OnCollapseItem(wxTreeEvent &event )
     long cookie;
     /* Workaround because DeleteChildren has disapeared (why?) and
      * CollapseAndReset doesn't work as advertised (deletes parent too) */
-    child = m_treeCtrl->GetFirstChild(parent, cookie);
+    child = m_treeCtrl->GetFirstChild(parentId, cookie);
     while (child.IsOk())
     {
         m_treeCtrl->Delete(child);
         /* Not GetNextChild below, because the cookie mechanism can't
          * handle disappearing children! */
-        child = m_treeCtrl->GetFirstChild(parent, cookie);
+        child = m_treeCtrl->GetFirstChild(parentId, cookie);
     }
 }
 
@@ -907,6 +907,12 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
     }
 }
 
+void wxGenericDirCtrl::ReCreateTree()
+{
+    CollapseDir(m_treeCtrl->GetRootItem());
+    ExpandDir(m_treeCtrl->GetRootItem());
+}
+
 // Find the child that matches the first part of 'path'.
 // E.g. if a child path is "/usr" and 'path' is "/usr/include"
 // then the child for /usr is returned.
@@ -1184,6 +1190,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);
         }
@@ -1237,8 +1251,7 @@ void wxDirFilterListCtrl::OnSelFilter(wxCommandEvent& WXUNUSED(event))
 
     // If the filter has changed, the view is out of date, so
     // collapse the tree.
-    m_dirCtrl->GetTreeCtrl()->Collapse(m_dirCtrl->GetRootId());
-    m_dirCtrl->GetTreeCtrl()->Expand(m_dirCtrl->GetRootId());
+    m_dirCtrl->ReCreateTree();
 
     // Try to restore the selection, or at least the directory
     m_dirCtrl->ExpandPath(currentPath);