No change, improve wxDataViewMainWindow::ItemDeleted() readability.

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

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 582137ff02e39dd80776537f1683b62171f8e6ac..9511f209d435cab5cd3edc107bdf176e97f75014 100644 (file)
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -2039,13 +2039,16 @@ bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
     else // general case
     {
         wxDataViewTreeNode * node = FindNode(parent);
     else // general case
     {
         wxDataViewTreeNode * node = FindNode(parent);

-        int itemPosInNode = node ? node->GetChildren().Index(item.GetID()) : wxNOT_FOUND;

 
         // Notice that it is possible that the item being deleted is not in the
         // tree at all, for example we could be deleting a never shown (because
         // collapsed) item in a tree model. So it's not an error if we don't know
         // about this item, just return without doing anything then.
 
         // Notice that it is possible that the item being deleted is not in the
         // tree at all, for example we could be deleting a never shown (because
         // collapsed) item in a tree model. So it's not an error if we don't know
         // about this item, just return without doing anything then.

-        if ( !node || itemPosInNode == wxNOT_FOUND )
+        if ( !node )
+            return false;
+
+        int itemPosInNode = node->GetChildren().Index(item.GetID());
+        if ( itemPosInNode == wxNOT_FOUND )

             return false;
 
         bool isContainer = false;
             return false;
 
         bool isContainer = false;