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

Fix crash in propgrid sample, see #18537

Browse Source
This commit is contained in:
Paul Cornett 2019-10-22 19:51:50 -07:00
parent ab33227578
commit ffac936882
1 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
samples/propgrid/propgrid.cpp
View File

@ -2985,21 +2985,23 @@ void FormMain::OnSetPropertyValue( wxCommandEvent& WXUNUSED(event) )
void FormMain::OnInsertChoice( wxCommandEvent& WXUNUSED(event) ) void FormMain::OnInsertChoice( wxCommandEvent& WXUNUSED(event) )
{ {
wxPropertyGrid* pg = m_pPropGridManager->GetGrid(); wxPropertyGrid* pg = m_pPropGridManager->GetGrid();
wxPGProperty* selected = pg->GetSelection(); wxPGProperty* selected = pg->GetSelection();
const wxPGChoices& choices = selected->GetChoices();
// Insert new choice to the center of list if (selected)
{
const wxPGChoices& choices = selected->GetChoices();
if ( choices.IsOk() ) if ( choices.IsOk() )
{ {
int pos = choices.GetCount() / 2; // Insert new choice to the center of list
selected->InsertChoice("New Choice", pos);
} int pos = choices.GetCount() / 2;
else selected->InsertChoice("New Choice", pos);
{ return;
::wxMessageBox("First select a property with some choices."); }
} }
wxMessageBox("First select a property with some choices.");
} }
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
@ -3007,21 +3009,23 @@ void FormMain::OnInsertChoice( wxCommandEvent& WXUNUSED(event) )
void FormMain::OnDeleteChoice( wxCommandEvent& WXUNUSED(event) ) void FormMain::OnDeleteChoice( wxCommandEvent& WXUNUSED(event) )
{ {
wxPropertyGrid* pg = m_pPropGridManager->GetGrid(); wxPropertyGrid* pg = m_pPropGridManager->GetGrid();
wxPGProperty* selected = pg->GetSelection(); wxPGProperty* selected = pg->GetSelection();
const wxPGChoices& choices = selected->GetChoices();
// Deletes choice from the center of list if (selected)
{
const wxPGChoices& choices = selected->GetChoices();
if ( choices.IsOk() ) if ( choices.IsOk() )
{ {
int pos = choices.GetCount() / 2; // Deletes choice from the center of list
selected->DeleteChoice(pos);
} int pos = choices.GetCount() / 2;
else selected->DeleteChoice(pos);
{ return;
::wxMessageBox("First select a property with some choices."); }
} }
wxMessageBox("First select a property with some choices.");
} }
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------