haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some merge issues.

This commit is contained in:
Jeff Young 2018-04-17 20:23:26 +01:00
parent 2d5da8b04f
commit db2cda7271
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
eeschema/dialogs/dialog_fields_editor_global.cpp
View File

@ -285,6 +285,16 @@ public:
void RebuildRows( wxCheckBox* groupComponentsBox, wxDataViewListCtrl* fieldsCtrl ) void RebuildRows( wxCheckBox* groupComponentsBox, wxDataViewListCtrl* fieldsCtrl )
{ {
if ( GetView() )
{
// Commit any pending in-place edits before the row gets moved out from under
// the editor.
GetView()->DisableCellEditControl();
wxGridTableMessage msg( this, wxGRIDTABLE_NOTIFY_ROWS_DELETED, 0, m_rows.size() );
GetView()->ProcessTableMessage( msg );
}
m_rows.clear(); m_rows.clear();
for( unsigned i = 0; i < m_componentRefs.GetCount(); ++i ) for( unsigned i = 0; i < m_componentRefs.GetCount(); ++i )
@ -323,6 +333,12 @@ public:
return RefDesStringCompare( lhRef, rhRef ) < 0; return RefDesStringCompare( lhRef, rhRef ) < 0;
} ); } );
} }
if ( GetView() )
{
wxGridTableMessage msg( this, wxGRIDTABLE_NOTIFY_ROWS_APPENDED, m_rows.size() );
GetView()->ProcessTableMessage( msg );
}
} }