Fix typo in a copy/paste and a minor compil warning

This commit is contained in:
jean-pierre charras 2022-02-07 17:32:19 +01:00
parent bc710e3d97
commit 2485648a54
2 changed files with 5 additions and 6 deletions

View File

@ -145,10 +145,6 @@ void FONTCONFIG::ListFonts( std::vector<std::string>& aFonts )
if( !outline ) if( !outline )
continue; continue;
FcStrSet* langStrSet = FcLangSetGetLangs( langSet );
FcStrList* langStrList = FcStrListCreate( langStrSet );
FcChar8* langStr = FcStrListNext( langStrList );
std::string theFamily( reinterpret_cast<char *>( family ) ); std::string theFamily( reinterpret_cast<char *>( family ) );
#ifdef __WXMAC__ #ifdef __WXMAC__
@ -159,6 +155,9 @@ void FONTCONFIG::ListFonts( std::vector<std::string>& aFonts )
// GTK, on the other hand, doesn't appear to support wxLocale::IsAvailable(), // GTK, on the other hand, doesn't appear to support wxLocale::IsAvailable(),
// so we can't run these checks. // so we can't run these checks.
FcStrSet* langStrSet = FcLangSetGetLangs( langSet );
FcStrList* langStrList = FcStrListCreate( langStrSet );
FcChar8* langStr = FcStrListNext( langStrList );
bool langSupported = false; bool langSupported = false;
if( !langStr ) if( !langStr )

View File

@ -420,8 +420,8 @@ int BOARD_INSPECTION_TOOL::InspectClearance( const TOOL_EVENT& aEvent )
reportCompileError( r ); reportCompileError( r );
r->Report( "" ); r->Report( "" );
r->Report( wxString::Format( _( "Minimum thermal spoke count: %s." ), r->Report( wxString::Format( _( "Minimum thermal spoke count: %d." ),
StringFromValue( units, width, true ) ) ); minSpokes ) );
std::shared_ptr<CONNECTIVITY_DATA> connectivity = pad->GetBoard()->GetConnectivity(); std::shared_ptr<CONNECTIVITY_DATA> connectivity = pad->GetBoard()->GetConnectivity();
const KICAD_T zones[] = { PCB_ZONE_T, EOT }; const KICAD_T zones[] = { PCB_ZONE_T, EOT };