From 1fdaac344021337343138090305cb794a1891528 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Wed, 22 Apr 2020 12:31:06 +0100 Subject: [PATCH] Safer way to do std::string conversions. --- eeschema/dialogs/dialog_fields_editor_global.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eeschema/dialogs/dialog_fields_editor_global.cpp b/eeschema/dialogs/dialog_fields_editor_global.cpp index 2629e21e07..23abadd50c 100644 --- a/eeschema/dialogs/dialog_fields_editor_global.cpp +++ b/eeschema/dialogs/dialog_fields_editor_global.cpp @@ -769,7 +769,7 @@ DIALOG_FIELDS_EDITOR_GLOBAL::DIALOG_FIELDS_EDITOR_GLOBAL( SCH_EDIT_FRAME* parent if( m_grid->IsColShown( col ) ) { EESCHEMA_SETTINGS* cfg = static_cast( 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 ) ) { @@ -1099,10 +1099,10 @@ void DIALOG_FIELDS_EDITOR_GLOBAL::OnTableColSize( wxGridSizeEvent& aEvent ) { EESCHEMA_SETTINGS* cfg = static_cast( Kiface().KifaceSettings() ); 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 ) ) - cfg->m_FieldEditorPanel.column_widths[ key.ToStdString() ] = m_grid->GetColSize( col ); + cfg->m_FieldEditorPanel.column_widths[ key ] = m_grid->GetColSize( col ); aEvent.Skip(); }