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

Prevent assertion warnings in propgrid sample when "Test ReplaceProperty" is invoked more then once.

Browse Source 
New property replacing the old one should have unique name to prevent assertion warning in wxPropertyGridInterfcae::ReplaceProperty when there is checked if property of a given name already exists.
This commit is contained in:
Artur Wieczorek
2015-03-28 21:27:06 +01:00
parent bdbadbeb53
commit eb7979d25e
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
samples/propgrid/propgrid.cpp
View File

@@ -2610,12 +2610,24 @@ void FormMain::OnTestReplaceClick( wxCommandEvent& WXUNUSED(event) )
choices.Add(wxT("Flag 1"),0x0002); choices.Add(wxT("Flag 1"),0x0002);
choices.Add(wxT("Flag 2"),0x0004); choices.Add(wxT("Flag 2"),0x0004);
choices.Add(wxT("Flag 3"),0x0008); choices.Add(wxT("Flag 3"),0x0008);
const long maxVal = 0x000F;
// Look for unused property name
wxString propName = wxT("ReplaceFlagsProperty");
int idx = 0;
while ( m_pPropGridManager->GetPropertyByName(propName) )
{
propName = wxString::Format(_T("ReplaceFlagsProperty %i"), ++idx);
}
// Replace property and select new one
// with random value in range [1..maxVal]
const long propVal = wxGetLocalTime() % maxVal + 1;
wxPGProperty* newId = m_pPropGridManager->ReplaceProperty( pgId, wxPGProperty* newId = m_pPropGridManager->ReplaceProperty( pgId,
new wxFlagsProperty(wxT("ReplaceFlagsProperty"), wxPG_LABEL, choices, 0x0003) ); new wxFlagsProperty(propName, wxPG_LABEL, choices, propVal) );
m_pPropGridManager->SetPropertyAttribute( newId, m_pPropGridManager->SetPropertyAttribute( newId,
wxPG_BOOL_USE_CHECKBOX, wxPG_BOOL_USE_CHECKBOX,
true, true,
wxPG_RECURSE ); wxPG_RECURSE );
m_pPropGridManager->SelectProperty(newId);
} }
else else
wxMessageBox(wxT("First select a property")); wxMessageBox(wxT("First select a property"));