Fix more utf8 comparisons
This commit is contained in:
parent
c042b51be9
commit
8fb4901d4b
|
@ -174,7 +174,7 @@ void SYMBOL_TREE_SYNCHRONIZING_ADAPTER::updateLibrary( LIB_TREE_NODE_LIBRARY& aL
|
||||||
auto aliasIt = std::find_if( aliases.begin(), aliases.end(),
|
auto aliasIt = std::find_if( aliases.begin(), aliases.end(),
|
||||||
[&] ( const LIB_SYMBOL* a )
|
[&] ( const LIB_SYMBOL* a )
|
||||||
{
|
{
|
||||||
return a->GetName() == (*nodeIt)->m_LibId.GetLibItemName();
|
return a->GetName() == (*nodeIt)->m_LibId.GetLibItemName().wx_str();
|
||||||
} );
|
} );
|
||||||
|
|
||||||
if( aliasIt != aliases.end() )
|
if( aliasIt != aliases.end() )
|
||||||
|
|
|
@ -278,7 +278,7 @@ bool FP_TREE_SYNCHRONIZING_ADAPTER::GetAttr( wxDataViewItem const& aItem, unsign
|
||||||
switch( node->m_Type )
|
switch( node->m_Type )
|
||||||
{
|
{
|
||||||
case LIB_TREE_NODE::LIBRARY:
|
case LIB_TREE_NODE::LIBRARY:
|
||||||
if( node->m_Name == m_frame->GetLoadedFPID().GetLibNickname() )
|
if( node->m_Name == m_frame->GetLoadedFPID().GetLibNickname().wx_str() )
|
||||||
{
|
{
|
||||||
// mark the current library if it's collapsed
|
// mark the current library if it's collapsed
|
||||||
if( !m_widget->IsExpanded( ToItem( node ) ) )
|
if( !m_widget->IsExpanded( ToItem( node ) ) )
|
||||||
|
|
|
@ -2349,7 +2349,7 @@ void PCB_EDIT_FRAME::ExchangeFootprint( FOOTPRINT* aExisting, FOOTPRINT* aNew,
|
||||||
processTextItem( aExisting->Value(), aNew->Value(),
|
processTextItem( aExisting->Value(), aNew->Value(),
|
||||||
// reset value text only when it is a proxy for the footprint ID
|
// reset value text only when it is a proxy for the footprint ID
|
||||||
// (cf replacing value "MountingHole-2.5mm" with "MountingHole-4.0mm")
|
// (cf replacing value "MountingHole-2.5mm" with "MountingHole-4.0mm")
|
||||||
aExisting->GetValue() == aExisting->GetFPID().GetLibItemName(),
|
aExisting->GetValue() == aExisting->GetFPID().GetLibItemName().wx_str(),
|
||||||
resetTextLayers, resetTextEffects, aUpdated );
|
resetTextLayers, resetTextEffects, aUpdated );
|
||||||
|
|
||||||
// Copy fields in accordance with the reset* flags
|
// Copy fields in accordance with the reset* flags
|
||||||
|
|
Loading…
Reference in New Issue