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

merged 2.2 branch

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2000-07-15 19:51:35 +00:00
parent 8a693e6e04
commit f6bcfd974e
1835 changed files with 237729 additions and 67990 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
samples/regtest/regtest.cpp
View File

@@ -162,7 +162,7 @@ public:
void AddStdKeys();
private:
DECLARE_EVENT_TABLE();
DECLARE_EVENT_TABLE()
};
// ----------------------------------------------------------------------------
@@ -194,7 +194,7 @@ public:
void OnInfo (wxCommandEvent& event);
DECLARE_EVENT_TABLE();
DECLARE_EVENT_TABLE()
private:
RegTreeCtrl *m_treeCtrl;
@@ -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();