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

Rename wxGenericDirCtrl::ExpandDir() to PopulateNode().

Browse Source 
This function doesn't really expand anything (unlike CollapseDir()) so give it
a better name while keeping the old one too for compatibility.

See #12735.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66315 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-12-03 14:12:23 +00:00
parent 81ebc04192
commit ef57807f27
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/generic/dirctrlg.h
View File

@@ -189,6 +189,8 @@ protected:
bool ExtractWildcard(const wxString& filterStr, int n, wxString& filter, wxString& description); bool ExtractWildcard(const wxString& filterStr, int n, wxString& filter, wxString& description);
private: private:
void PopulateNode(wxTreeItemId node);
bool m_showHidden; bool m_showHidden;
wxTreeItemId m_rootId; wxTreeItemId m_rootId;
wxString m_defaultPath; // Starting path wxString m_defaultPath; // Starting path

8
src/generic/dirctrlg.cpp
View File

@@ -788,7 +788,7 @@ void wxGenericDirCtrl::CollapseDir(wxTreeItemId parentId)
m_treeCtrl->Thaw(); m_treeCtrl->Thaw();
} }
void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) void wxGenericDirCtrl::PopulateNode(wxTreeItemId parentId)
{ {
wxDirItemData *data = (wxDirItemData *) m_treeCtrl->GetItemData(parentId); wxDirItemData *data = (wxDirItemData *) m_treeCtrl->GetItemData(parentId);
@@ -935,6 +935,12 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
} }
} }
void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
{
// ExpandDir() will not actually expand the tree node, just populate it
PopulateNode(parentId);
}
void wxGenericDirCtrl::ReCreateTree() void wxGenericDirCtrl::ReCreateTree()
{ {
CollapseDir(m_treeCtrl->GetRootItem()); CollapseDir(m_treeCtrl->GetRootItem());