From b23de238c89013320f9c02cf8aa95cb5a61d9769 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Mon, 22 Aug 2011 14:14:50 +0000 Subject: [PATCH] No change, improve wxDataViewMainWindow::ItemDeleted() readability. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68845 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/datavgen.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp index 582137ff02..9511f209d4 100644 --- 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); - 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. - 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; -- 2.50.0