BC++ fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7322 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-04-30 16:05:24 +00:00
parent da95cfa91d
commit 0e950afdf3
6 changed files with 31 additions and 15 deletions

View File

@@ -913,10 +913,11 @@ bool RegTreeCtrl::TreeNode::OnExpand()
if ( isEmpty ) {
// this is for the case when our last child was just deleted
m_pTree->Collapse(Id());
wxTreeItemId theId(Id()); // Temp variable seems necessary for BC++
m_pTree->Collapse(theId);
// we won't be expanded any more
m_pTree->SetItemHasChildren(Id(), FALSE);
m_pTree->SetItemHasChildren(theId, FALSE);
}
return TRUE;
@@ -935,14 +936,15 @@ void RegTreeCtrl::TreeNode::Refresh()
if ( !IsKey() )
return;
bool wasExpanded = m_pTree->IsExpanded(Id());
wxTreeItemId theId(Id()); // Temp variable seems necessary for BC++
bool wasExpanded = m_pTree->IsExpanded(theId);
if ( wasExpanded )
m_pTree->Collapse(Id());
m_pTree->Collapse(theId);
OnCollapse();
m_pTree->SetItemHasChildren(Id());
m_pTree->SetItemHasChildren(theId);
if ( wasExpanded ) {
m_pTree->Expand(Id());
m_pTree->Expand(theId);
OnExpand();
}
}
@@ -967,7 +969,8 @@ bool RegTreeCtrl::TreeNode::DeleteChild(TreeNode *child)
}
if ( ok ) {
m_pTree->Delete(child->Id());
wxTreeItemId theId(child->Id()); // Temp variable seems necessary for BC++
m_pTree->Delete(theId);
Refresh();
}
@@ -983,7 +986,8 @@ void RegTreeCtrl::TreeNode::DestroyChildren()
long lId = m_aChildren[n]->Id();
// no, wxTreeCtrl will do it
//delete m_aChildren[n];
m_pTree->Delete(lId);
wxTreeItemId theId(lId); // Temp variable seems necessary for BC++
m_pTree->Delete(theId);
}
m_aChildren.Empty();