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

Fixed property iterator crash when iterating through 'non-interesting' properties at the edges of the grid.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61839 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2009-09-06 07:53:53 +00:00
parent 169dc97542
commit 6e82ecf99d
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/propgrid/propgridpagestate.cpp
View File

@@ -107,7 +107,8 @@ void wxPropertyGridIteratorBase::Assign( const wxPropertyGridIteratorBase& it )
void wxPropertyGridIteratorBase::Prev() void wxPropertyGridIteratorBase::Prev()
{ {
wxPGProperty* property = m_property; wxPGProperty* property = m_property;
wxASSERT( property ); if ( !property )
return;
wxPGProperty* parent = property->GetParent(); wxPGProperty* parent = property->GetParent();
wxASSERT( parent ); wxASSERT( parent );
@@ -152,7 +153,8 @@ void wxPropertyGridIteratorBase::Prev()
void wxPropertyGridIteratorBase::Next( bool iterateChildren ) void wxPropertyGridIteratorBase::Next( bool iterateChildren )
{ {
wxPGProperty* property = m_property; wxPGProperty* property = m_property;
wxASSERT( property ); if ( !property )
return;
if ( property->GetChildCount() && if ( property->GetChildCount() &&
wxPG_ITERATOR_PARENTEXMASK_TEST(property, m_parentExMask) && wxPG_ITERATOR_PARENTEXMASK_TEST(property, m_parentExMask) &&