compile and warning fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47924 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index a054a591503898e7a8e1b5255921650a8e74fb8f..f47731e5e45927b2fe9253960cf6cabb9243627e 100644 (file)
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -353,13 +353,14 @@ public:
         wxDataViewTreeLeaves lvs = leaves;
         nodes.Empty();
         leaves.Empty();
         wxDataViewTreeLeaves lvs = leaves;
         nodes.Empty();
         leaves.Empty();

-               
+

         int len = nds.GetCount();
         if(len > 0)
         {
         int len = nds.GetCount();
         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()
         { return m_mainWindow->Cleared(); }
     virtual void Resort()
     virtual bool Cleared()
         { return m_mainWindow->Cleared(); }
     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() );
     if( GetOwner()->GetModel()->IsContainer( item ) )
     {
     node->GetChildren().Remove( item.GetID() );
     if( GetOwner()->GetModel()->IsContainer( item ) )
     {

-        wxDataViewTreeNode * n ;
+        wxDataViewTreeNode * n = NULL;

         wxDataViewTreeNodes nodes = node->GetNodes();
         int len = nodes.GetCount();
         for( int i = 0 ; i < len; i ++)
         wxDataViewTreeNodes nodes = node->GetNodes();
         int len = nodes.GetCount();
         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 );
         sub -= n->GetSubTreeCount();
         DestroyTreeHelper(n);
         node->GetNodes().Remove( n );
         sub -= n->GetSubTreeCount();
         DestroyTreeHelper(n);