Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'gendirctrl-fixes' of https://github.com/MaartenBent/wxWidgets

Browse Source 
Fixes for handling filters in wxGenericDirCtrl.

See https://github.com/wxWidgets/wxWidgets/pull/1925
This commit is contained in:
Vadim Zeitlin
2020-07-04 13:08:57 +02:00
parent 76c7f723fc 1f0e548e3a
commit 9ea0f6de3c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/generic/dirctrlg.cpp
View File

@@ -996,7 +996,7 @@ wxString wxGenericDirCtrl::GetPath(wxTreeItemId itemId) const
const wxDirItemData* const wxDirItemData*
data = static_cast<wxDirItemData*>(m_treeCtrl->GetItemData(itemId)); data = static_cast<wxDirItemData*>(m_treeCtrl->GetItemData(itemId));
return data->m_path; return data ? data->m_path : wxString();
} }
wxString wxGenericDirCtrl::GetPath() const wxString wxGenericDirCtrl::GetPath() const
@@ -1222,7 +1222,7 @@ void wxGenericDirCtrl::DoResize()
wxSize filterSz ; wxSize filterSz ;
if (m_filterListCtrl) if (m_filterListCtrl)
{ {
filterSz = m_filterListCtrl->GetSize(); filterSz = m_filterListCtrl->GetBestSize();
sz.y -= (filterSz.y + verticalSpacing); sz.y -= (filterSz.y + verticalSpacing);
} }
m_treeCtrl->SetSize(0, 0, sz.x, sz.y); m_treeCtrl->SetSize(0, 0, sz.x, sz.y);