X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/42dcacf02b163699d4623097c4d04980f11d9040..19e30148e18cc99296b26503c155e5cef59045f4:/src/generic/dirctrlg.cpp

diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index 2a2bba6bf7..38c948fc2c 100644
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -312,13 +312,12 @@ static const char * icon8_xpm[] = {
 "                "};
 
 
-#define wxID_TREECTRL          7000
-#define wxID_FILTERLISTCTRL    7001
-
 #if defined(__DOS__)
 
-static bool wxIsDriveAvailable(const wxString dirName)
+bool wxIsDriveAvailable(const wxString& dirName)
 {
+    // FIXME_MGL - this method leads to hang up under Watcom for some reason
+#ifndef __WATCOMC__
     if ( dirName.Len() == 3 && dirName[1u] == wxT(':') )
     {
         wxString dirNameLower(dirName.Lower());
@@ -329,6 +328,7 @@ static bool wxIsDriveAvailable(const wxString dirName)
                 wxPathExists(dirNameLower));
     }
     else
+#endif
         return TRUE;
 }
 
@@ -363,7 +363,7 @@ int setdrive(int drive)
 #endif // !GNUWIN32
 }
 
-static bool wxIsDriveAvailable(const wxString dirName)
+bool wxIsDriveAvailable(const wxString& dirName)
 {
 #ifdef __WIN32__
     UINT errorMode = SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX);
@@ -404,7 +404,7 @@ static int LINKAGEMODE wxDirCtrlStringCompareFunction(const void *first, const v
 {
     wxString *strFirst = (wxString *)first;
     wxString *strSecond = (wxString *)second;
-    
+
     return strFirst->CmpNoCase(*strSecond);
 }
 
@@ -451,7 +451,7 @@ bool wxDirItemData::HasSubDirs() const
     return dir.HasSubDirs();
 }
 
-bool wxDirItemData::HasFiles(const wxString& spec) const
+bool wxDirItemData::HasFiles(const wxString& WXUNUSED(spec)) const
 {
     if (m_path.IsEmpty())
         return FALSE;
@@ -502,7 +502,11 @@ bool wxGenericDirCtrl::Create(wxWindow *parent,
 
     Init();
 
-    long treeStyle = wxTR_HAS_BUTTONS | wxTR_EDIT_LABELS | wxTR_HIDE_ROOT;
+    long treeStyle = wxTR_HAS_BUTTONS | wxTR_HIDE_ROOT;
+
+    if (style & wxDIRCTRL_EDIT_LABELS)
+        treeStyle |= wxTR_EDIT_LABELS;
+
     if ((style & wxDIRCTRL_3D_INTERNAL) == 0)
         treeStyle |= wxNO_BORDER;
 
@@ -547,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())
@@ -575,8 +579,10 @@ void wxGenericDirCtrl::Init()
 void wxGenericDirCtrl::ShowHidden( bool show )
 {
     m_showHidden = show;
-    
-    // reparse FIXME 
+
+    wxString path = GetPath();
+    ReCreateTree();
+    SetPath(path);
 }
 
 void wxGenericDirCtrl::AddSection(const wxString& path, const wxString& name, int imageId)
@@ -742,9 +748,14 @@ void wxGenericDirCtrl::OnExpandItem(wxTreeEvent &event)
 
 void wxGenericDirCtrl::OnCollapseItem(wxTreeEvent &event )
 {
-    wxTreeItemId child, parent = event.GetItem();
+    CollapseDir(event.GetItem());
+}
 
-    wxDirItemData *data = (wxDirItemData *) m_treeCtrl->GetItemData(event.GetItem());
+void wxGenericDirCtrl::CollapseDir(wxTreeItemId parentId)
+{
+    wxTreeItemId child;
+
+    wxDirItemData *data = (wxDirItemData *) m_treeCtrl->GetItemData(parentId);
     if (!data->m_isExpanded)
         return;
 
@@ -752,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);
     }
 }
 
@@ -896,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.
@@ -1173,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);
         }
@@ -1226,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);