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

Moved property unattachment code from wxPropertyGridInterface::RemoveProperty() to wxPropertyGridPageState::DoDelete() - fixes deferred removal issue

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63624 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2010-03-04 15:09:15 +00:00
parent f7d32bb716
commit 2ac06991a7
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/propgrid/propgridiface.cpp
View File

@@ -166,10 +166,6 @@ wxPGProperty* wxPropertyGridInterface::RemoveProperty( wxPGPropArg id )
state->DoDelete( p, false ); state->DoDelete( p, false );
// Mark the property as 'unattached'
p->m_parentState = NULL;
p->m_parent = NULL;
RefreshGrid(state); RefreshGrid(state);
return p; return p;

4
src/propgrid/propgridpagestate.cpp
View File

@@ -1979,6 +1979,10 @@ void wxPropertyGridPageState::DoDelete( wxPGProperty* item, bool doDelete )
if ( pg && pg->m_propHover == item ) if ( pg && pg->m_propHover == item )
pg->m_propHover = NULL; pg->m_propHover = NULL;
// Mark the property as 'unattached'
item->m_parentState = NULL;
item->m_parent = NULL;
// We can actually delete it now // We can actually delete it now
if ( doDelete ) if ( doDelete )
delete item; delete item;