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

Fix ambiguous overloads on wx 3.3

This commit is contained in:
Alex Shvartzkop 2023-09-14 18:35:19 +03:00
parent f2c6f25967
commit ff49d5ada9
17 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/dialogs/dialog_plugin_options.cpp
View File

@ -146,7 +146,7 @@ bool DIALOG_PLUGIN_OPTIONS::TransferDataFromWindow()
}
}
*m_result = LIB_TABLE::FormatOptions( &props );
*m_result = LIB_TABLE::FormatOptions( &props ).wx_str();
return true;
}

2
cvpcb/cvpcb_mainframe.cpp
View File

@ -853,7 +853,7 @@ void CVPCB_MAINFRAME::DisplayStatus()
{
// Use the footprint of the selected symbol
if( symbol )
lib = symbol->GetFPID().GetLibNickname();
lib = symbol->GetFPID().GetUniStringLibNickname();
}
else if( GetFocusedControl() == CVPCB_MAINFRAME::CONTROL_LIBRARY )
{

2
cvpcb/display_footprints_frame.cpp
View File

@ -498,7 +498,7 @@ void DISPLAY_FOOTPRINTS_FRAME::InitDisplay()
wxString footprintName = parentframe->GetSelectedFootprint();
if( footprintName.IsEmpty() && comp )
footprintName = comp->GetFPID().Format();
footprintName = comp->GetFPID().Format().wx_str();
if( m_currentFootprint == footprintName && m_currentComp == comp )
return;

4
eeschema/dialogs/dialog_edit_symbols_libid.cpp
View File

@ -250,7 +250,7 @@ public:
SYMBOL_CANDIDATE( SCH_SYMBOL* aSymbol )
{
m_Symbol = aSymbol;
m_InitialLibId = m_Symbol->GetLibId().Format();
m_InitialLibId = m_Symbol->GetLibId().Format().wx_str();
m_Row = -1;
m_IsOrphan = false;
m_Screen = nullptr;
@ -696,7 +696,7 @@ bool DIALOG_EDIT_SYMBOLS_LIBID::setLibIdByBrowser( int aRow )
}
wxString new_libid;
new_libid = sel.LibId.Format();
new_libid = sel.LibId.Format().wx_str();
m_grid->SetCellValue( aRow, COL_NEW_LIBID, UnescapeString( new_libid ) );

4
eeschema/netlist_exporters/netlist_exporter_xml.cpp
View File

@ -328,8 +328,8 @@ XNODE* NETLIST_EXPORTER_XML::makeSymbols( unsigned aCtl )
if( symbol->UseLibIdLookup() )
{
libName = symbol->GetLibId().GetLibNickname();
partName = symbol->GetLibId().GetLibItemName();
libName = symbol->GetLibId().GetUniStringLibNickname();
partName = symbol->GetLibId().GetUniStringLibItemName();
}
else
{

4
eeschema/project_rescue.cpp
View File

@ -148,7 +148,7 @@ void RESCUE_CASE_CANDIDATE::FindRescues( RESCUER& aRescuer,
for( SCH_SYMBOL* eachSymbol : *( aRescuer.GetSymbols() ) )
{
symbol_name = eachSymbol->GetLibId().GetLibItemName();
symbol_name = eachSymbol->GetLibId().GetUniStringLibItemName();
if( last_symbol_name != symbol_name )
{
@ -364,7 +364,7 @@ RESCUE_SYMBOL_LIB_TABLE_CANDIDATE::RESCUE_SYMBOL_LIB_TABLE_CANDIDATE(
int aConvert ) : RESCUE_CANDIDATE()
{
m_requested_id = aRequestedId;
m_requested_name = aRequestedId.Format();
m_requested_name = aRequestedId.Format().wx_str();
m_new_id = aNewId;
m_lib_candidate = aLibCandidate;
m_cache_candidate = aCacheCandidate;

2
eeschema/sch_plugins/altium/sch_altium_plugin.cpp
View File

@ -273,7 +273,7 @@ wxString SCH_ALTIUM_PLUGIN::getLibName()
m_libName = "noname";
m_libName += "-altium-import";
m_libName = LIB_ID::FixIllegalChars( m_libName, true );
m_libName = LIB_ID::FixIllegalChars( m_libName, true ).wx_str();
}
return m_libName;

4
eeschema/sch_plugins/cadstar/cadstar_sch_archive_plugin.cpp
View File

@ -99,7 +99,7 @@ SCH_SHEET* CADSTAR_SCH_ARCHIVE_PLUGIN::LoadSchematicFile( const wxString&
if( libName.IsEmpty() )
libName = "noname";
libName = LIB_ID::FixIllegalChars( libName, true );
libName = LIB_ID::FixIllegalChars( libName, true ).wx_str();
wxFileName libFileName( aSchematic->Prj().GetProjectPath(), libName,
KiCadSymbolLibFileExtension );
@ -265,7 +265,7 @@ void CADSTAR_SCH_ARCHIVE_PLUGIN::ensureLoadedLibrary( const wxString& aLibraryPa
if( aProperties && aProperties->count( "fplib" ) )
{
fplibname = aProperties->at( "fplib" );
fplibname = aProperties->at( "fplib" ).wx_str();
}
// Get timestamp

2
eeschema/sch_plugins/eagle/sch_eagle_plugin.cpp
View File

@ -162,7 +162,7 @@ wxString SCH_EAGLE_PLUGIN::getLibName()
m_libName = wxT( "noname" );
m_libName += wxT( "-eagle-import" );
m_libName = LIB_ID::FixIllegalChars( m_libName, true );
m_libName = LIB_ID::FixIllegalChars( m_libName, true ).wx_str();
}
return m_libName;

4
eeschema/sch_symbol.cpp
View File

@ -1303,12 +1303,12 @@ bool SCH_SYMBOL::ResolveTextVar( const SCH_SHEET_PATH* aPath, wxString* token, i
}
else if( token->IsSameAs( wxT( "SYMBOL_LIBRARY" ) ) )
{
*token = m_lib_id.GetLibNickname();
*token = m_lib_id.GetUniStringLibNickname();
return true;
}
else if( token->IsSameAs( wxT( "SYMBOL_NAME" ) ) )
{
*token = m_lib_id.GetLibItemName();
*token = m_lib_id.GetUniStringLibItemName();
return true;
}
else if( token->IsSameAs( wxT( "SYMBOL_DESCRIPTION" ) ) )

4
eeschema/symbol_editor/symbol_editor.cpp
View File

@ -501,7 +501,7 @@ void SYMBOL_EDIT_FRAME::Save()
wxString libName;
if( IsSymbolTreeShown() )
libName = GetTreeLIBID().GetLibNickname();
libName = GetTreeLIBID().GetUniStringLibNickname();
if( libName.empty() )
{
@ -963,7 +963,7 @@ void SYMBOL_EDIT_FRAME::Revert( bool aConfirm )
reload_currentSymbol = libName == curr_libId.GetLibNickname();
if( reload_currentSymbol )
curr_symbolName = curr_libId.GetLibItemName();
curr_symbolName = curr_libId.GetUniStringLibItemName();
}
else
{

2
eeschema/symbol_tree_synchronizing_adapter.cpp
View File

@ -235,7 +235,7 @@ void SYMBOL_TREE_SYNCHRONIZING_ADAPTER::GetValue( wxVariant& aVariant, wxDataVie
{
case NAME_COL:
if( m_frame->GetCurSymbol() && m_frame->GetCurSymbol()->GetLibId() == node->m_LibId )
node->m_Name = m_frame->GetCurSymbol()->GetLibId().GetLibItemName();
node->m_Name = m_frame->GetCurSymbol()->GetLibId().GetUniStringLibItemName();
if( node->m_Pinned )
aVariant = GetPinningSymbol() + UnescapeString( node->m_Name );

2
pcbnew/dialogs/panel_fp_lib_table.cpp
View File

@ -975,7 +975,7 @@ void PANEL_FP_LIB_TABLE::browseLibrariesHandler( wxCommandEvent& event )
bool doAdd = true;
if( fileType == IO_MGR::KICAD_SEXP && fn.GetExt() != KiCadFootprintLibPathExtension )
nickname = LIB_ID::FixIllegalChars( fn.GetFullName(), true );
nickname = LIB_ID::FixIllegalChars( fn.GetFullName(), true ).wx_str();
if( cur_model()->ContainsNickname( nickname ) )
{

4
pcbnew/footprint.cpp
View File

@ -647,12 +647,12 @@ bool FOOTPRINT::ResolveTextVar( wxString* token, int aDepth ) const
}
else if( token->IsSameAs( wxT( "FOOTPRINT_LIBRARY" ) ) )
{
*token = m_fpid.GetLibNickname();
*token = m_fpid.GetUniStringLibNickname();
return true;
}
else if( token->IsSameAs( wxT( "FOOTPRINT_NAME" ) ) )
{
*token = m_fpid.GetLibItemName();
*token = m_fpid.GetUniStringLibItemName();
return true;
}
else if( token->StartsWith( wxT( "SHORT_NET_NAME(" ) )

7
pcbnew/footprint_edit_frame.cpp
View File

@ -465,7 +465,10 @@ LIB_ID FOOTPRINT_EDIT_FRAME::GetLoadedFPID() const
void FOOTPRINT_EDIT_FRAME::ClearModify()
{
if( GetBoard()->GetFirstFootprint() )
m_footprintNameWhenLoaded = GetBoard()->GetFirstFootprint()->GetFPID().GetLibItemName();
{
m_footprintNameWhenLoaded =
GetBoard()->GetFirstFootprint()->GetFPID().GetUniStringLibItemName();
}
GetScreen()->SetContentModified( false );
}
@ -521,7 +524,7 @@ void FOOTPRINT_EDIT_FRAME::ReloadFootprint( FOOTPRINT* aFootprint )
m_originalFootprintCopy.reset( static_cast<FOOTPRINT*>( aFootprint->Clone() ) );
m_originalFootprintCopy->SetParent( nullptr );
m_footprintNameWhenLoaded = aFootprint->GetFPID().GetLibItemName();
m_footprintNameWhenLoaded = aFootprint->GetFPID().GetUniStringLibItemName();
PCB_BASE_EDIT_FRAME::AddFootprintToBoard( aFootprint );
// Ensure item UUIDs are valid

3
pcbnew/fp_tree_synchronizing_adapter.cpp
View File

@ -193,7 +193,8 @@ void FP_TREE_SYNCHRONIZING_ADAPTER::GetValue( wxVariant& aVariant, wxDataViewIte
if( node->m_LibId == m_frame->GetLoadedFPID() && !m_frame->IsCurrentFPFromBoard() )
{
// Do not use GetLoadedFPID(); it returns m_footprintNameWhenLoaded.
node->m_Name = m_frame->GetBoard()->GetFirstFootprint()->GetFPID().GetLibItemName();
node->m_Name =
m_frame->GetBoard()->GetFirstFootprint()->GetFPID().GetUniStringLibItemName();
// mark modified part with an asterisk
if( m_frame->GetScreen()->IsContentModified() )

2
pcbnew/load_select_footprint.cpp
View File

@ -293,7 +293,7 @@ FOOTPRINT* PCB_BASE_FRAME::SelectFootprintFromLibTree( LIB_ID aPreselect )
if( !fpid.IsValid() )
return nullptr;
else
footprintName = fpid.Format();
footprintName = fpid.Format().wx_str();
}
try