From 9cf4dd05b34d24ae162b892614593ed5b7370d3d Mon Sep 17 00:00:00 2001 From: Jon Evans Date: Fri, 24 Jan 2025 22:33:00 -0500 Subject: [PATCH] Fixes to build with wxWidgets 3.3 --- pcbnew/pcbnew_jobs_handler.cpp | 4 ++-- qa/pcbnew_utils/board_test_utils.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pcbnew/pcbnew_jobs_handler.cpp b/pcbnew/pcbnew_jobs_handler.cpp index 14ba2e580f..58256fc7bb 100644 --- a/pcbnew/pcbnew_jobs_handler.cpp +++ b/pcbnew/pcbnew_jobs_handler.cpp @@ -1824,7 +1824,7 @@ int PCBNEW_JOBS_HANDLER::JobExportDrc( JOB* aJob ) if( netlist_str == annotateMsg ) { - m_reporter->Report( netlist_str + wxT( "\n" ), RPT_SEVERITY_ERROR ); + m_reporter->Report( wxString( netlist_str ) + wxT( "\n" ), RPT_SEVERITY_ERROR ); checkParity = false; } } @@ -2125,4 +2125,4 @@ void PCBNEW_JOBS_HANDLER::loadOverrideDrawingSheet( BOARD* aBrd, const wxString& // failed loading custom path, revert back to default loadSheet( aBrd->GetProject()->GetProjectFile().m_BoardDrawingSheetFile ); -} \ No newline at end of file +} diff --git a/qa/pcbnew_utils/board_test_utils.cpp b/qa/pcbnew_utils/board_test_utils.cpp index e9d788c054..5cd5b470c5 100644 --- a/qa/pcbnew_utils/board_test_utils.cpp +++ b/qa/pcbnew_utils/board_test_utils.cpp @@ -240,7 +240,7 @@ void LoadAndTestFootprintFile( const wxString& aLibRelativePath, const wxString& * when the cache is set up on future runs. */ TEMPORARY_DIRECTORY tempLib( "kicad_qa_fp_roundtrip", ".pretty" ); - const wxString fpFilename = fp1->GetFPID().GetLibItemName() + ".kicad_mod"; + const wxString fpFilename = fp1->GetFPID().GetLibItemName() + wxString( ".kicad_mod" ); BOOST_TEST_MESSAGE( "Resaving footprint: " << fpFilename << " in " << tempLib.GetPath() );