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

Added wxTreeCtrl::GetItemParent to deprecate GetParent.

Browse Source 
Moved GetParent into WX_COMPAT_2_2 and exposed base GetParent in
that case too.

Replaced all lib/sample uses of wxTC::GetParent with GetItemParent.

Updated docs to suit.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@18448 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee
2002-12-29 07:48:21 +00:00
parent 5cc29dd12d
commit ad99843335
19 changed files with 62 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/generic/treectlg.cpp
View File

@@ -1121,7 +1121,7 @@ bool wxGenericTreeCtrl::IsBold(const wxTreeItemId& item) const
// navigation
// -----------------------------------------------------------------------------
wxTreeItemId wxGenericTreeCtrl::GetParent(const wxTreeItemId& item) const
wxTreeItemId wxGenericTreeCtrl::GetItemParent(const wxTreeItemId& item) const
{
wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
@@ -1221,7 +1221,7 @@ wxTreeItemId wxGenericTreeCtrl::GetNext(const wxTreeItemId& item) const
do
{
toFind = GetNextSibling(p);
p = GetParent(p);
p = GetItemParent(p);
} while (p.IsOk() && !toFind.IsOk());
return toFind;
}
@@ -1766,13 +1766,13 @@ void wxGenericTreeCtrl::SelectItem(const wxTreeItemId& itemId,
if ( GetEventHandler()->ProcessEvent( event ) && !event.IsAllowed() )
return;
wxTreeItemId parent = GetParent( itemId );
wxTreeItemId parent = GetItemParent( itemId );
while (parent.IsOk())
{
if (!IsExpanded(parent))
Expand( parent );
parent = GetParent( parent );
parent = GetItemParent( parent );
}
EnsureVisible( itemId );
@@ -2576,7 +2576,7 @@ void wxGenericTreeCtrl::OnChar( wxKeyEvent &event )
wxTreeItemId prev = GetPrevSibling( m_key_current );
if (!prev)
{
prev = GetParent( m_key_current );
prev = GetItemParent( m_key_current );
if ((prev == GetRootItem()) && HasFlag(wxTR_HIDE_ROOT))
{
break; // don't go to root if it is hidden
@@ -2615,7 +2615,7 @@ void wxGenericTreeCtrl::OnChar( wxKeyEvent &event )
// left arrow goes to the parent
case WXK_LEFT:
{
wxTreeItemId prev = GetParent( m_current );
wxTreeItemId prev = GetItemParent( m_current );
if ((prev == GetRootItem()) && HasFlag(wxTR_HIDE_ROOT))
{
// don't go to root if it is hidden
@@ -2651,7 +2651,7 @@ void wxGenericTreeCtrl::OnChar( wxKeyEvent &event )
wxTreeItemId current = m_key_current;
while (current && !next)
{
current = GetParent( current );
current = GetItemParent( current );
if (current) next = GetNextSibling( current );
}
}