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

Safer way to do std::string conversions.

This commit is contained in:
Jeff Young 2020-04-22 12:31:06 +01:00
parent 857aca78cd
commit 1fdaac3440
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
eeschema/dialogs/dialog_fields_editor_global.cpp
View File

@ -769,7 +769,7 @@ DIALOG_FIELDS_EDITOR_GLOBAL::DIALOG_FIELDS_EDITOR_GLOBAL( SCH_EDIT_FRAME* parent
if( m_grid->IsColShown( col ) ) if( m_grid->IsColShown( col ) )
{ {
EESCHEMA_SETTINGS* cfg = static_cast<EESCHEMA_SETTINGS*>( Kiface().KifaceSettings() ); EESCHEMA_SETTINGS* cfg = static_cast<EESCHEMA_SETTINGS*>( Kiface().KifaceSettings() );
std::string key = m_dataModel->GetColLabelValue( col ).ToStdString(); std::string key = m_dataModel->GetColLabelValue( col ).ToUTF8();
if( cfg->m_FieldEditorPanel.column_widths.count( key ) ) if( cfg->m_FieldEditorPanel.column_widths.count( key ) )
{ {
@ -1099,10 +1099,10 @@ void DIALOG_FIELDS_EDITOR_GLOBAL::OnTableColSize( wxGridSizeEvent& aEvent )
{ {
EESCHEMA_SETTINGS* cfg = static_cast<EESCHEMA_SETTINGS*>( Kiface().KifaceSettings() ); EESCHEMA_SETTINGS* cfg = static_cast<EESCHEMA_SETTINGS*>( Kiface().KifaceSettings() );
int col = aEvent.GetRowOrCol(); int col = aEvent.GetRowOrCol();
std::string key = m_grid->GetColLabelValue( col ).ToStdString(); std::string key = m_grid->GetColLabelValue( col ).ToUTF8();
if( m_grid->GetColSize( col ) ) if( m_grid->GetColSize( col ) )
cfg->m_FieldEditorPanel.column_widths[ key.ToStdString() ] = m_grid->GetColSize( col ); cfg->m_FieldEditorPanel.column_widths[ key ] = m_grid->GetColSize( col );
aEvent.Skip(); aEvent.Skip();
} }