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

Prevent renaming already renamed wxPG property waiting for deferred deletion.

Browse Source 
Name of the property to be deleted with delay is changed to the some meaningless name in order to avoid conflict with other active properties.
It is enough to do this only once.

See #16617

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78029 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Artur Wieczorek
2014-10-16 22:33:33 +00:00
parent b72eb78c96
commit 633b49ef6e
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/propgrid/propgridpagestate.cpp
View File

@@ -1875,17 +1875,17 @@ void wxPropertyGridPageState::DoDelete( wxPGProperty* item, bool doDelete )
// Prevent adding duplicates to the lists.
if ( doDelete )
{
if ( pg->m_deletedProperties.Index(item) == wxNOT_FOUND )
{
pg->m_deletedProperties.push_back(item);
}
if ( pg->m_deletedProperties.Index(item) != wxNOT_FOUND )
return;
pg->m_deletedProperties.push_back(item);
}
else
{
if ( pg->m_removedProperties.Index(item) == wxNOT_FOUND )
{
pg->m_removedProperties.push_back(item);
}
if ( pg->m_removedProperties.Index(item) != wxNOT_FOUND )
return;
pg->m_removedProperties.push_back(item);
}
// Rename the property so it won't remain in the way