X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd775aae7b8eace70d8fc41a23623505ad568355..ef4d6ce8e42ef63259bc798c5e98d01d6415d9d2:/src/generic/dirctrlg.cpp diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp index 70385cff71..c7ed4450aa 100644 --- a/src/generic/dirctrlg.cpp +++ b/src/generic/dirctrlg.cpp @@ -57,8 +57,8 @@ // FIXME - Mingw32 1.0 has both _getdrive() and _chdrive(). For now, let's assume // older releases don't, but it should be verified and the checks modified // accordingly. -#if !defined(__GNUWIN32__) || \ - (defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1) +#if !defined(__WXWINE__) && (!defined(__GNUWIN32__) || \ + (defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1)) #include #include #include @@ -375,8 +375,8 @@ bool wxIsDriveAvailable(const wxString& dirName) if (dirName.Len() == 3 && dirName[(size_t)1] == wxT(':')) { wxString dirNameLower(dirName.Lower()); -#if defined(__GNUWIN32__) && \ - !(defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1) +#if defined(__WXWINE__) || (defined(__GNUWIN32__) && \ + !(defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1)) success = wxPathExists(dirNameLower); #else int currentDrive = _getdrive(); @@ -502,16 +502,11 @@ bool wxGenericDirCtrl::Create(wxWindow *parent, Init(); - long treeStyle = wxTR_HAS_BUTTONS; + long treeStyle = wxTR_HAS_BUTTONS | wxTR_HIDE_ROOT; - if (style & wxDIRCTRL_EDITABLE) + if (style & wxDIRCTRL_EDIT_LABELS) 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; @@ -556,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()) @@ -586,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); } @@ -754,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; @@ -764,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); } } @@ -908,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. @@ -996,7 +1001,7 @@ bool wxGenericDirCtrl::ExpandPath(const wxString& path) { wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(childId); - if (data && data->m_path != "" && !data->m_isDir) + if (data && data->m_path != wxT("") && !data->m_isDir) { m_treeCtrl->SelectItem(childId); m_treeCtrl->EnsureVisible(childId); @@ -1246,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);