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

[ 1922123 ] Generic wxDataViewCtrl leaks

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53021 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2008-04-05 12:24:57 +00:00
parent 0bdfa38835
commit 741230732f
1 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/generic/datavgen.cpp
View File

@@ -1921,7 +1921,7 @@ void wxDataViewRenameTimer::Notify()
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
//The tree building helper, declared firstly //The tree building helper, declared firstly
void BuildTreeHelper( wxDataViewModel * model, wxDataViewItem & item, wxDataViewTreeNode * node); static void BuildTreeHelper( wxDataViewModel * model, wxDataViewItem & item, wxDataViewTreeNode * node);
int LINKAGEMODE wxDataViewSelectionCmp( unsigned int row1, unsigned int row2 ) int LINKAGEMODE wxDataViewSelectionCmp( unsigned int row1, unsigned int row2 )
{ {
@@ -2196,19 +2196,15 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
else else
wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, flag); wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, flag);
} }
else
{
// I am wondering whether we should draw dot lines between tree nodes
if (node)
delete node;
// Yes, if the node does not have any child, it must be a leaf which
// mean that it is a temporarily created by GetTreeNodeByRow
}
//force the expander column to left-center align //force the expander column to left-center align
cell->SetAlignment( wxALIGN_CENTER_VERTICAL ); cell->SetAlignment( wxALIGN_CENTER_VERTICAL );
} }
if (node && !node->HasChildren())
{
// Yes, if the node does not have any child, it must be a leaf which
// mean that it is a temporarily created by GetTreeNodeByRow
wxDELETE(node)
}
// cannot be bigger than allocated space // cannot be bigger than allocated space
wxSize size = cell->GetSize(); wxSize size = cell->GetSize();
@@ -2399,7 +2395,7 @@ bool wxDataViewMainWindow::ItemAdded(const wxDataViewItem & parent, const wxData
return true; return true;
} }
void DestroyTreeHelper( wxDataViewTreeNode * node); static void DestroyTreeHelper( wxDataViewTreeNode * node);
bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent, bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
const wxDataViewItem& item) const wxDataViewItem& item)
@@ -2457,7 +2453,7 @@ bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
node->GetNodes().Remove( n ); node->GetNodes().Remove( n );
sub -= n->GetSubTreeCount(); sub -= n->GetSubTreeCount();
DestroyTreeHelper(n); ::DestroyTreeHelper(n);
} }
//Make the row number invalid and get a new valid one when user call GetRowCount //Make the row number invalid and get a new valid one when user call GetRowCount
m_count = -1; m_count = -1;
@@ -3073,7 +3069,7 @@ void wxDataViewMainWindow::OnExpanding( unsigned int row )
if( node->GetChildrenNumber() == 0 ) if( node->GetChildrenNumber() == 0 )
{ {
SortPrepare(); SortPrepare();
BuildTreeHelper(GetOwner()->GetModel(), node->GetItem(), node); ::BuildTreeHelper(GetOwner()->GetModel(), node->GetItem(), node);
} }
m_count = -1; m_count = -1;
UpdateDisplay(); UpdateDisplay();
@@ -3157,7 +3153,7 @@ wxDataViewTreeNode * wxDataViewMainWindow::FindNode( const wxDataViewItem & item
if( node->GetChildrenNumber() == 0 ) if( node->GetChildrenNumber() == 0 )
{ {
SortPrepare(); SortPrepare();
BuildTreeHelper(model, node->GetItem(), node); ::BuildTreeHelper(model, node->GetItem(), node);
} }
wxDataViewTreeNodes nodes = node->GetNodes(); wxDataViewTreeNodes nodes = node->GetNodes();
@@ -3320,7 +3316,7 @@ int wxDataViewMainWindow::GetRowByItem(const wxDataViewItem & item)
} }
} }
void BuildTreeHelper( wxDataViewModel * model, wxDataViewItem & item, wxDataViewTreeNode * node) static void BuildTreeHelper( wxDataViewModel * model, wxDataViewItem & item, wxDataViewTreeNode * node)
{ {
if( !model->IsContainer( item ) ) if( !model->IsContainer( item ) )
return ; return ;
@@ -3370,13 +3366,13 @@ void wxDataViewMainWindow::BuildTree(wxDataViewModel * model)
m_count = -1 ; m_count = -1 ;
} }
void DestroyTreeHelper( wxDataViewTreeNode * node ) static void DestroyTreeHelper( wxDataViewTreeNode * node )
{ {
if( node->GetNodeNumber() != 0 ) if( node->GetNodeNumber() != 0 )
{ {
int len = node->GetNodeNumber(); int len = node->GetNodeNumber();
int i = 0 ; int i = 0 ;
wxDataViewTreeNodes nodes = node->GetNodes(); wxDataViewTreeNodes& nodes = node->GetNodes();
for( ; i < len; i ++ ) for( ; i < len; i ++ )
{ {
DestroyTreeHelper(nodes[i]); DestroyTreeHelper(nodes[i]);
@@ -3389,7 +3385,7 @@ void wxDataViewMainWindow::DestroyTree()
{ {
if (m_root) if (m_root)
{ {
DestroyTreeHelper(m_root); ::DestroyTreeHelper(m_root);
m_count = 0; m_count = 0;
m_root = NULL; m_root = NULL;
} }
@@ -3666,6 +3662,8 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
OnExpanding( current ); OnExpanding( current );
} }
} }
if (node && !node->HasChildren())
delete node;
} }
//If the user click the expander, we do not do editing even if the column with expander are editable //If the user click the expander, we do not do editing even if the column with expander are editable
if (m_lastOnSame && !expander && !ignore_other_columns) if (m_lastOnSame && !expander && !ignore_other_columns)
@@ -3842,6 +3840,12 @@ wxDataViewCtrl::~wxDataViewCtrl()
{ {
if (m_notifier) if (m_notifier)
GetModel()->RemoveNotifier( m_notifier ); GetModel()->RemoveNotifier( m_notifier );
wxDataViewColumnList::const_iterator iter;
for (iter = m_cols.begin(); iter!=m_cols.end(); iter++)
{
delete *iter;
}
} }
void wxDataViewCtrl::Init() void wxDataViewCtrl::Init()