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

Remove useless check for NULL in wxFindWindowRecursively().

Browse Source 
This is an internal function which is only ever called with non-NULL window.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78492 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2015-02-15 00:01:47 +00:00
parent 22f951fb74
commit 8b525fd1be
1 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/common/wincmn.cpp
View File

@@ -1912,23 +1912,20 @@ wxWindow *wxFindWindowRecursively(const wxWindow *parent,
long id, long id,
wxFindWindowCmp cmp) wxFindWindowCmp cmp)
{ {
if ( parent ) // see if this is the one we're looking for
{ if ( (*cmp)(parent, label, id) )
// see if this is the one we're looking for return (wxWindow *)parent;
if ( (*cmp)(parent, label, id) )
return (wxWindow *)parent;
// It wasn't, so check all its children // It wasn't, so check all its children
for ( wxWindowList::compatibility_iterator node = parent->GetChildren().GetFirst(); for ( wxWindowList::compatibility_iterator node = parent->GetChildren().GetFirst();
node; node;
node = node->GetNext() ) node = node->GetNext() )
{ {
// recursively check each child // recursively check each child
wxWindow *win = (wxWindow *)node->GetData(); wxWindow *win = (wxWindow *)node->GetData();
wxWindow *retwin = wxFindWindowRecursively(win, label, id, cmp); wxWindow *retwin = wxFindWindowRecursively(win, label, id, cmp);
if (retwin) if (retwin)
return retwin; return retwin;
}
} }
// Not found // Not found