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

Fix wxPropertyGrid::DoEndLabelEdit function, cont.

Browse Source 
Explicit cell content handling for edited label is necessary only for column other then 0 because cell handling for label in column is 0 is done inside wxPGProperty::SetLabel() function.
This commit is contained in:
Artur Wieczorek
2015-05-13 20:51:50 +02:00
parent 1cd916fc0a
commit b7c4b51b41
1 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/propgrid/propgrid.cpp
View File

@@ -1093,21 +1093,30 @@ void wxPropertyGrid::DoEndLabelEdit( bool commit, int selFlags )
}
wxString text = m_labelEditor->GetValue();
wxPGCell* cell = NULL;
if ( prop->HasCell(labelColIdx) )
{
cell = &prop->GetCell(labelColIdx);
}
else if ( labelColIdx != 0 )
{
cell = &prop->GetOrCreateCell(labelColIdx);
}
if ( labelColIdx == 0 )
// Cell handling for label in column 0
// is done internally in SetLabel() function
if ( labelColIdx == 0 )
{
prop->SetLabel(text);
}
else
{
wxPGCell* cell = NULL;
if ( prop->HasCell(labelColIdx) )
{
cell = &prop->GetCell(labelColIdx);
}
else
{
cell = &prop->GetOrCreateCell(labelColIdx);
}
if ( cell && cell->HasText() )
cell->SetText(text);
if ( cell && cell->HasText() )
{
cell->SetText(text);
}
}
}
m_selColumn = 1;