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

Fix build on Linux 

wxString does not automatically cast to std::string
This commit is contained in:
Jon Evans 2021-08-14 09:57:01 -04:00
parent 8eba0b356b
commit aae0e7e121
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/settings/color_settings.cpp
View File

@ -238,12 +238,12 @@ COLOR_SETTINGS::COLOR_SETTINGS( const wxString& aFilename ) :
// We don't support opacity in some 3D colors but some versions of 5.99 let // We don't support opacity in some 3D colors but some versions of 5.99 let
// you set it. // you set it.
for( wxString path : { "3d_viewer.background_top", for( std::string path : { "3d_viewer.background_top",
"3d_viewer.background_bottom", "3d_viewer.background_bottom",
"3d_viewer.copper", "3d_viewer.copper",
"3d_viewer.silkscreen_top", "3d_viewer.silkscreen_top",
"3d_viewer.silkscreen_bottom", "3d_viewer.silkscreen_bottom",
"3d_viewer.solderpaste" } ) "3d_viewer.solderpaste" } )
{ {
if( OPT<COLOR4D> optval = Get<COLOR4D>( path ) ) if( OPT<COLOR4D> optval = Get<COLOR4D>( path ) )
Set( path, optval->WithAlpha( 1.0 ) ); Set( path, optval->WithAlpha( 1.0 ) );