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

compile and warning fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47924 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2007-08-07 13:50:44 +00:00
parent 7305bbf0ac
commit a8505db0fa
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/generic/datavgen.cpp
View File

@@ -353,13 +353,14 @@ public:
wxDataViewTreeLeaves lvs = leaves; wxDataViewTreeLeaves lvs = leaves;
nodes.Empty(); nodes.Empty();
leaves.Empty(); leaves.Empty();
int len = nds.GetCount(); int len = nds.GetCount();
if(len > 0) if(len > 0)
{ {
for(int i = 0; i < len; i ++) int i;
for(i = 0; i < len; i ++)
nodes.Add(nds[i]); nodes.Add(nds[i]);
for(int i = 0; i < len; i ++) for(i = 0; i < len; i ++)
nodes[i]->Resort(); nodes[i]->Resort();
} }
@@ -555,7 +556,7 @@ public:
virtual bool Cleared() virtual bool Cleared()
{ return m_mainWindow->Cleared(); } { return m_mainWindow->Cleared(); }
virtual void Resort() virtual void Resort()
{ return m_mainWindow->Resort(); } { m_mainWindow->Resort(); }
wxDataViewMainWindow *m_mainWindow; wxDataViewMainWindow *m_mainWindow;
}; };
@@ -1987,7 +1988,7 @@ bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
node->GetChildren().Remove( item.GetID() ); node->GetChildren().Remove( item.GetID() );
if( GetOwner()->GetModel()->IsContainer( item ) ) if( GetOwner()->GetModel()->IsContainer( item ) )
{ {
wxDataViewTreeNode * n ; wxDataViewTreeNode * n = NULL;
wxDataViewTreeNodes nodes = node->GetNodes(); wxDataViewTreeNodes nodes = node->GetNodes();
int len = nodes.GetCount(); int len = nodes.GetCount();
for( int i = 0 ; i < len; i ++) for( int i = 0 ; i < len; i ++)
@@ -1998,6 +1999,10 @@ bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
break; break;
} }
} }
if (!n)
return false;
node->GetNodes().Remove( n ); node->GetNodes().Remove( n );
sub -= n->GetSubTreeCount(); sub -= n->GetSubTreeCount();
DestroyTreeHelper(n); DestroyTreeHelper(n);