Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-08-17 00:47:34 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Rename wxGenericTreeCtrl::Next_Visible flag to Next_Opened

Browse Source 
8ca1be38e2 (Add wxGenericTreeCtrl::DoGetNext(Next_Visible) function,
2023-11-08) added this flag with a confusing name because it doesn't
mean the same thing here as in GetNextVisible(): here "visible" meant
just "in an expanded branch" and not necessarily "visible on screen".

Rename the flag to make it more clear what it means.

No real changes yet.
This commit is contained in:
Vadim Zeitlin
2026-08-15 20:43:41 +02:00
parent 01fdfa2b50
commit c535a1400f
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/wx/generic/treectlg.h
+1 -1
View File
@@ -373,7 +373,7 @@ private:
enum
{
Next_Any = 0,
Next_Visible = 1
Next_Opened = 1
};
wxTreeItemId DoGetNext(const wxTreeItemId& item, int flags = 0) const;
src/generic/treectlg.cpp
+6 -6
View File
@@ -1497,7 +1497,7 @@ wxGenericTreeCtrl::DoGetNext(const wxTreeItemId& item, int flags) const
wxGenericTreeItem *i = GetItemPtr(item);
// First see if there are any children.
if ( !(flags & Next_Visible) || i->IsExpanded() )
if ( !(flags & Next_Opened) || i->IsExpanded() )
{
wxGenericTreeItems& children = i->GetChildren();
if (!children.empty())
@@ -1538,7 +1538,7 @@ wxTreeItemId wxGenericTreeCtrl::GetNextVisible(const wxTreeItemId& item) const
wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
wxASSERT_MSG( IsVisible(item), wxT("this item itself should be visible") );
return DoGetNext(item, Next_Visible);
return DoGetNext(item, Next_Opened);
}
wxTreeItemId wxGenericTreeCtrl::GetPrevVisible(const wxTreeItemId& item) const
@@ -1606,13 +1606,13 @@ wxTreeItemId wxGenericTreeCtrl::FindItem(const wxTreeItemId& idParent,
wxTreeItemId itemid = idParent;
if ( prefix.length() == 1 )
{
itemid = DoGetNext(itemid, Next_Visible);
itemid = DoGetNext(itemid, Next_Opened);
}
// look for the item starting with the given prefix after it
while ( itemid.IsOk() && !GetItemText(itemid).Lower().StartsWith(prefix) )
{
itemid = DoGetNext(itemid, Next_Visible);
itemid = DoGetNext(itemid, Next_Opened);
}
// if we haven't found anything...
@@ -1623,14 +1623,14 @@ wxTreeItemId wxGenericTreeCtrl::FindItem(const wxTreeItemId& idParent,
if ( HasFlag(wxTR_HIDE_ROOT) )
{
// can't select virtual root
itemid = DoGetNext(itemid, Next_Visible);
itemid = DoGetNext(itemid, Next_Opened);
}
// and try all the items (stop when we get to the one we started from)
while ( itemid.IsOk() && itemid != idParent &&
!GetItemText(itemid).Lower().StartsWith(prefix) )
{
itemid = DoGetNext(itemid, Next_Visible);
itemid = DoGetNext(itemid, Next_Opened);
}
// If we haven't found the item but wrapped back to the one we started
// from, id.IsOk() must be false