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

Commit mem leak fix I introduced

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53679 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2008-05-20 19:40:10 +00:00
parent 9b50afeff7
commit e170469f11
1 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/generic/datavgen.cpp
View File

@@ -2947,16 +2947,23 @@ int wxDataViewMainWindow::GetLineStart( unsigned int row ) const
unsigned int r; unsigned int r;
for (r = 0; r < row; r++) for (r = 0; r < row; r++)
{ {
const wxDataViewTreeNode* node = GetTreeNodeByRow(r); const wxDataViewTreeNode* node = GetTreeNodeByRow(r);
if (!node) return start; if (!node) return start;
wxDataViewItem item = node->GetItem(); wxDataViewItem item = node->GetItem();
unsigned int cols = GetOwner()->GetColumnCount(); if (node && !node->HasChildren())
unsigned int col; {
int height = m_lineHeight; // Yes, if the node does not have any child, it must be a leaf which
for (col = 0; col < cols; col++) // mean that it is a temporarily created by GetTreeNodeByRow
{ wxDELETE(node)
}
unsigned int cols = GetOwner()->GetColumnCount();
unsigned int col;
int height = m_lineHeight;
for (col = 0; col < cols; col++)
{
const wxDataViewColumn *column = GetOwner()->GetColumn(col); const wxDataViewColumn *column = GetOwner()->GetColumn(col);
if (column->IsHidden()) if (column->IsHidden())
continue; // skip it! continue; // skip it!
@@ -2970,9 +2977,10 @@ int wxDataViewMainWindow::GetLineStart( unsigned int row ) const
wxDataViewRenderer *renderer2 = const_cast<wxDataViewRenderer*>(renderer); wxDataViewRenderer *renderer2 = const_cast<wxDataViewRenderer*>(renderer);
renderer2->SetValue( value ); renderer2->SetValue( value );
height = wxMax( height, renderer->GetSize().y ); height = wxMax( height, renderer->GetSize().y );
} }
start += height;
start += height;
} }
return start; return start;
@@ -3004,6 +3012,13 @@ int wxDataViewMainWindow::GetLineAt( unsigned int y ) const
wxDataViewItem item = node->GetItem(); wxDataViewItem item = node->GetItem();
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)
}
unsigned int cols = GetOwner()->GetColumnCount(); unsigned int cols = GetOwner()->GetColumnCount();
unsigned int col; unsigned int col;
int height = m_lineHeight; int height = m_lineHeight;
@@ -3053,6 +3068,13 @@ int wxDataViewMainWindow::GetLineHeight( unsigned int row ) const
wxDataViewItem item = node->GetItem(); wxDataViewItem item = node->GetItem();
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)
}
int height = m_lineHeight; int height = m_lineHeight;
unsigned int cols = GetOwner()->GetColumnCount(); unsigned int cols = GetOwner()->GetColumnCount();