From 08cf9a1e209fb87ccd39f7c68c739e5c038b83ed Mon Sep 17 00:00:00 2001 From: Wayne Stambaugh Date: Thu, 17 Dec 2020 08:12:18 -0500 Subject: [PATCH] Move headers from common folders to appropriate include folders round 1. --- common/dialogs/dialog_locked_items_query.cpp | 2 +- common/dialogs/dialog_page_settings.cpp | 2 +- common/dialogs/dialog_print_generic.cpp | 10 +++++++--- common/dialogs/dialog_text_entry.cpp | 4 ++-- common/dialogs/panel_gal_display_options.cpp | 7 ++++--- common/dialogs/panel_setup_severities.cpp | 2 +- common/widgets/grid_color_swatch_helpers.cpp | 4 ++-- common/widgets/lib_tree.cpp | 4 ++-- common/widgets/wx_grid.cpp | 17 +++++++++++------ .../dialogs/dialog_lib_symbol_properties.cpp | 2 +- eeschema/dialogs/dialog_schematic_setup.cpp | 2 +- eeschema/eeschema_config.cpp | 2 +- gerbview/dialogs/dialog_print_gerbview.cpp | 2 +- .../dialogs/dialog_locked_items_query.h | 0 .../dialogs/dialog_page_settings.h | 0 .../dialogs/dialog_print_generic.h | 2 +- {common => include}/dialogs/dialog_text_entry.h | 0 .../dialogs/panel_gal_display_options.h | 0 .../dialogs/panel_mouse_settings.h | 0 .../dialogs/panel_setup_severities.h | 0 {common => include}/lib_tree_model.h | 0 {common => include}/lib_tree_model_adapter.h | 0 {common => include}/rc_item.h | 0 {common => include}/template_fieldnames.h | 0 .../widgets/grid_color_swatch_helpers.h | 0 {common => include}/widgets/lib_tree.h | 0 {common => include}/widgets/wx_grid.h | 0 .../dialogs/dialogs_for_printing.cpp | 2 +- pagelayout_editor/pl_editor_frame.cpp | 2 +- pagelayout_editor/tools/pl_editor_control.cpp | 5 +++-- pcbnew/dialogs/dialog_board_setup.cpp | 7 ++++--- .../dialog_edit_footprint_for_fp_editor.cpp | 4 ++-- pcbnew/dialogs/dialog_footprint_properties.cpp | 2 +- pcbnew/dialogs/dialog_print_pcbnew.cpp | 16 ++++++++++------ pcbnew/dialogs/panel_setup_mask_and_paste.cpp | 8 ++++---- pcbnew/footprint_libraries_utils.cpp | 2 +- pcbnew/microwave/microwave_footprint.cpp | 2 +- pcbnew/microwave/microwave_inductor.cpp | 2 +- pcbnew/microwave/microwave_polygon.cpp | 4 ++-- pcbnew/tools/pcb_selection_tool.cpp | 2 +- 40 files changed, 68 insertions(+), 52 deletions(-) rename {common => include}/dialogs/dialog_locked_items_query.h (100%) rename {common => include}/dialogs/dialog_page_settings.h (100%) rename {common => include}/dialogs/dialog_print_generic.h (98%) rename {common => include}/dialogs/dialog_text_entry.h (100%) rename {common => include}/dialogs/panel_gal_display_options.h (100%) rename {common => include}/dialogs/panel_mouse_settings.h (100%) rename {common => include}/dialogs/panel_setup_severities.h (100%) rename {common => include}/lib_tree_model.h (100%) rename {common => include}/lib_tree_model_adapter.h (100%) rename {common => include}/rc_item.h (100%) rename {common => include}/template_fieldnames.h (100%) rename {common => include}/widgets/grid_color_swatch_helpers.h (100%) rename {common => include}/widgets/lib_tree.h (100%) rename {common => include}/widgets/wx_grid.h (100%) diff --git a/common/dialogs/dialog_locked_items_query.cpp b/common/dialogs/dialog_locked_items_query.cpp index a7aee38ca9..0500ca4cc2 100644 --- a/common/dialogs/dialog_locked_items_query.cpp +++ b/common/dialogs/dialog_locked_items_query.cpp @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#include #include DIALOG_LOCKED_ITEMS_QUERY::DIALOG_LOCKED_ITEMS_QUERY( wxWindow* aParent, int aLockedItemCount ) : diff --git a/common/dialogs/dialog_page_settings.cpp b/common/dialogs/dialog_page_settings.cpp index 252f4cd1e8..b879fbafb8 100644 --- a/common/dialogs/dialog_page_settings.cpp +++ b/common/dialogs/dialog_page_settings.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/common/dialogs/dialog_print_generic.cpp b/common/dialogs/dialog_print_generic.cpp index fe8925b587..482f6e7b25 100644 --- a/common/dialogs/dialog_print_generic.cpp +++ b/common/dialogs/dialog_print_generic.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2018 CERN + * Copyright (C) 2020 KiCad Developers, see AUTHORS.txt for contributors. * Author: Maciej Suminski * * This program is free software: you can redistribute it and/or modify it @@ -16,7 +17,7 @@ * with this program. If not, see . */ -#include "dialog_print_generic.h" +#include #include #include @@ -27,6 +28,7 @@ static constexpr double MIN_SCALE = 0.01; static constexpr double MAX_SCALE = 100.0; + DIALOG_PRINT_GENERIC::DIALOG_PRINT_GENERIC( EDA_DRAW_FRAME* aParent, PRINTOUT_SETTINGS* aSettings ) : DIALOG_PRINT_GENERIC_BASE( aParent ), m_config( nullptr ), @@ -246,6 +248,7 @@ void DIALOG_PRINT_GENERIC::onPrintButtonClick( wxCommandEvent& event ) auto printout = std::unique_ptr( createPrintout( _( "Print" ) ) ); Pgm().m_Printing = true; + { if( !printer.Print( this, printout.get(), true ) ) { @@ -257,6 +260,7 @@ void DIALOG_PRINT_GENERIC::onPrintButtonClick( wxCommandEvent& event ) *s_PrintData = printer.GetPrintDialogData().GetPrintData(); } } + Pgm().m_Printing = false; } @@ -314,10 +318,10 @@ void DIALOG_PRINT_GENERIC::initPrintData() { if( pageInfo.IsPortrait() ) s_pageSetupData->SetPaperSize( wxSize( Mils2mm( pageInfo.GetWidthMils() ), - Mils2mm( pageInfo.GetHeightMils() ) ) ); + Mils2mm( pageInfo.GetHeightMils() ) ) ); else s_pageSetupData->SetPaperSize( wxSize( Mils2mm( pageInfo.GetHeightMils() ), - Mils2mm( pageInfo.GetWidthMils() ) ) ); + Mils2mm( pageInfo.GetWidthMils() ) ) ); } *s_PrintData = s_pageSetupData->GetPrintData(); diff --git a/common/dialogs/dialog_text_entry.cpp b/common/dialogs/dialog_text_entry.cpp index 9a47526baa..7243bd44f5 100644 --- a/common/dialogs/dialog_text_entry.cpp +++ b/common/dialogs/dialog_text_entry.cpp @@ -1,7 +1,7 @@ /* * This program source code file is part of KiCad, a free EDA CAD application. * - * Copyright (C) 2018 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 2018-2020 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#include WX_TEXT_ENTRY_DIALOG::WX_TEXT_ENTRY_DIALOG( wxWindow* aParent, diff --git a/common/dialogs/panel_gal_display_options.cpp b/common/dialogs/panel_gal_display_options.cpp index d714f68c00..db4122a5db 100644 --- a/common/dialogs/panel_gal_display_options.cpp +++ b/common/dialogs/panel_gal_display_options.cpp @@ -1,7 +1,7 @@ /* * This program source code file is part of KiCad, a free EDA CAD application. * - * Copyright (C) 2019 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 2019-2020 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -22,10 +22,11 @@ #include #include -#include +#include -PANEL_GAL_DISPLAY_OPTIONS::PANEL_GAL_DISPLAY_OPTIONS( EDA_DRAW_FRAME* aFrame, PAGED_DIALOG* aParent ) : +PANEL_GAL_DISPLAY_OPTIONS::PANEL_GAL_DISPLAY_OPTIONS( EDA_DRAW_FRAME* aFrame, + PAGED_DIALOG* aParent ) : wxPanel( aParent->GetTreebook(), wxID_ANY ), m_frame( aFrame ) { diff --git a/common/dialogs/panel_setup_severities.cpp b/common/dialogs/panel_setup_severities.cpp index 774ee1cab3..018acacd4c 100644 --- a/common/dialogs/panel_setup_severities.cpp +++ b/common/dialogs/panel_setup_severities.cpp @@ -24,7 +24,7 @@ #include #include #include -#include "panel_setup_severities.h" +#include #include diff --git a/common/widgets/grid_color_swatch_helpers.cpp b/common/widgets/grid_color_swatch_helpers.cpp index bee87f4763..2e6cc49d1d 100644 --- a/common/widgets/grid_color_swatch_helpers.cpp +++ b/common/widgets/grid_color_swatch_helpers.cpp @@ -1,7 +1,7 @@ /* * This program source code file is part of KiCad, a free EDA CAD application. * - * Copyright (C) 2018 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 2018-2020 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#include #include #include diff --git a/common/widgets/lib_tree.cpp b/common/widgets/lib_tree.cpp index 7f973061f2..9a8a82c547 100644 --- a/common/widgets/lib_tree.cpp +++ b/common/widgets/lib_tree.cpp @@ -2,7 +2,7 @@ * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2014 Henner Zeller - * Copyright (C) 2014-2019 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 2014-2020 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -22,7 +22,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "lib_tree.h" +#include #include #include #include diff --git a/common/widgets/wx_grid.cpp b/common/widgets/wx_grid.cpp index fbadd72db9..2745578048 100644 --- a/common/widgets/wx_grid.cpp +++ b/common/widgets/wx_grid.cpp @@ -1,7 +1,7 @@ /* * This program source code file is part of KiCad, a free EDA CAD application. * - * Copyright (C) 2018 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 2018-2020 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -24,7 +24,7 @@ #include #include #include -#include "wx_grid.h" +#include #include @@ -73,6 +73,7 @@ void WX_GRID::SetTable( wxGridTableBase* aTable, bool aTakeOwnership ) formBuilderColWidths[ i ] = GetColSize( i ); wxGrid::SetTable( aTable ); + // wxGrid::SetTable() may change the number of columns, so prevent out-of-bounds access // to formBuilderColWidths numberCols = std::min( numberCols, GetNumberCols() ); @@ -116,6 +117,7 @@ wxString WX_GRID::GetShownColumns() { if( shownColumns.Length() ) shownColumns << wxT( " " ); + shownColumns << i; } } @@ -242,7 +244,8 @@ int WX_GRID::GetVisibleWidth( int aCol, bool aHeader, bool aContents, bool aKeep if( aKeep ) size = GetRowLabelSize(); - // The 1.1 scale factor is due to the fact row labels use a bold font, bigger than the normal font + // The 1.1 scale factor is due to the fact row labels use a bold font, bigger than + // the normal font. // TODO: use a better way to evaluate the text size, for bold font for( int row = 0; aContents && row < GetNumberRows(); row++ ) size = std::max( size, int( GetTextExtent( GetRowLabelValue( row ) + "M" ).x * 1.1 ) ); @@ -252,12 +255,14 @@ int WX_GRID::GetVisibleWidth( int aCol, bool aHeader, bool aContents, bool aKeep if( aKeep ) size = GetColSize( aCol ); - // 'M' is generally the widest character, so we buffer the column width by default to ensure - // we don't write a continuous line of text at the column header + // 'M' is generally the widest character, so we buffer the column width by default to + // ensure we don't write a continuous line of text at the column header if( aHeader ) { EnsureColLabelsVisible(); - // The 1.1 scale factor is due to the fact headers use a bold font, bigger than the normal font + + // The 1.1 scale factor is due to the fact headers use a bold font, bigger than + // the normal font. size = std::max( size, int( GetTextExtent( GetColLabelValue( aCol ) + "M" ).x * 1.1 ) ); } diff --git a/eeschema/dialogs/dialog_lib_symbol_properties.cpp b/eeschema/dialogs/dialog_lib_symbol_properties.cpp index ae3d3194c0..7815ce3b48 100644 --- a/eeschema/dialogs/dialog_lib_symbol_properties.cpp +++ b/eeschema/dialogs/dialog_lib_symbol_properties.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/eeschema/dialogs/dialog_schematic_setup.cpp b/eeschema/dialogs/dialog_schematic_setup.cpp index b55f208163..04a7ccd549 100644 --- a/eeschema/dialogs/dialog_schematic_setup.cpp +++ b/eeschema/dialogs/dialog_schematic_setup.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/eeschema/eeschema_config.cpp b/eeschema/eeschema_config.cpp index 28a1140e93..b456e0ae89 100644 --- a/eeschema/eeschema_config.cpp +++ b/eeschema/eeschema_config.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/gerbview/dialogs/dialog_print_gerbview.cpp b/gerbview/dialogs/dialog_print_gerbview.cpp index 335c2afaae..66f1c093fb 100644 --- a/gerbview/dialogs/dialog_print_gerbview.cpp +++ b/gerbview/dialogs/dialog_print_gerbview.cpp @@ -2,7 +2,7 @@ * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2010-2016 Jean-Pierre Charras jp.charras at wanadoo.fr - * Copyright (C) 1992-2016 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 1992-2020 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 2018 CERN * Author: Maciej Suminski * diff --git a/common/dialogs/dialog_locked_items_query.h b/include/dialogs/dialog_locked_items_query.h similarity index 100% rename from common/dialogs/dialog_locked_items_query.h rename to include/dialogs/dialog_locked_items_query.h diff --git a/common/dialogs/dialog_page_settings.h b/include/dialogs/dialog_page_settings.h similarity index 100% rename from common/dialogs/dialog_page_settings.h rename to include/dialogs/dialog_page_settings.h diff --git a/common/dialogs/dialog_print_generic.h b/include/dialogs/dialog_print_generic.h similarity index 98% rename from common/dialogs/dialog_print_generic.h rename to include/dialogs/dialog_print_generic.h index 031815d1d2..7eb37b05c3 100644 --- a/common/dialogs/dialog_print_generic.h +++ b/include/dialogs/dialog_print_generic.h @@ -19,7 +19,7 @@ #ifndef DIALOG_PRINT_GENERIC_H #define DIALOG_PRINT_GENERIC_H -#include "dialog_print_generic_base.h" +#include #include #include diff --git a/common/dialogs/dialog_text_entry.h b/include/dialogs/dialog_text_entry.h similarity index 100% rename from common/dialogs/dialog_text_entry.h rename to include/dialogs/dialog_text_entry.h diff --git a/common/dialogs/panel_gal_display_options.h b/include/dialogs/panel_gal_display_options.h similarity index 100% rename from common/dialogs/panel_gal_display_options.h rename to include/dialogs/panel_gal_display_options.h diff --git a/common/dialogs/panel_mouse_settings.h b/include/dialogs/panel_mouse_settings.h similarity index 100% rename from common/dialogs/panel_mouse_settings.h rename to include/dialogs/panel_mouse_settings.h diff --git a/common/dialogs/panel_setup_severities.h b/include/dialogs/panel_setup_severities.h similarity index 100% rename from common/dialogs/panel_setup_severities.h rename to include/dialogs/panel_setup_severities.h diff --git a/common/lib_tree_model.h b/include/lib_tree_model.h similarity index 100% rename from common/lib_tree_model.h rename to include/lib_tree_model.h diff --git a/common/lib_tree_model_adapter.h b/include/lib_tree_model_adapter.h similarity index 100% rename from common/lib_tree_model_adapter.h rename to include/lib_tree_model_adapter.h diff --git a/common/rc_item.h b/include/rc_item.h similarity index 100% rename from common/rc_item.h rename to include/rc_item.h diff --git a/common/template_fieldnames.h b/include/template_fieldnames.h similarity index 100% rename from common/template_fieldnames.h rename to include/template_fieldnames.h diff --git a/common/widgets/grid_color_swatch_helpers.h b/include/widgets/grid_color_swatch_helpers.h similarity index 100% rename from common/widgets/grid_color_swatch_helpers.h rename to include/widgets/grid_color_swatch_helpers.h diff --git a/common/widgets/lib_tree.h b/include/widgets/lib_tree.h similarity index 100% rename from common/widgets/lib_tree.h rename to include/widgets/lib_tree.h diff --git a/common/widgets/wx_grid.h b/include/widgets/wx_grid.h similarity index 100% rename from common/widgets/wx_grid.h rename to include/widgets/wx_grid.h diff --git a/pagelayout_editor/dialogs/dialogs_for_printing.cpp b/pagelayout_editor/dialogs/dialogs_for_printing.cpp index 24208848ae..6d64453120 100644 --- a/pagelayout_editor/dialogs/dialogs_for_printing.cpp +++ b/pagelayout_editor/dialogs/dialogs_for_printing.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include "invoke_pl_editor_dialog.h" #include "pl_editor_frame.h" diff --git a/pagelayout_editor/pl_editor_frame.cpp b/pagelayout_editor/pl_editor_frame.cpp index dc3aa0425c..fe4b51a1a9 100644 --- a/pagelayout_editor/pl_editor_frame.cpp +++ b/pagelayout_editor/pl_editor_frame.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/pagelayout_editor/tools/pl_editor_control.cpp b/pagelayout_editor/tools/pl_editor_control.cpp index 6a923af1db..27364fd649 100644 --- a/pagelayout_editor/tools/pl_editor_control.cpp +++ b/pagelayout_editor/tools/pl_editor_control.cpp @@ -2,7 +2,7 @@ * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2019 CERN - * Copyright (C) 2019 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 2019-2020 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include @@ -38,6 +38,7 @@ #include "tools/pl_editor_control.h" #include "tools/pl_selection_tool.h" + bool PL_EDITOR_CONTROL::Init() { m_frame = getEditFrame(); diff --git a/pcbnew/dialogs/dialog_board_setup.cpp b/pcbnew/dialogs/dialog_board_setup.cpp index e17f4468cc..6383adf130 100644 --- a/pcbnew/dialogs/dialog_board_setup.cpp +++ b/pcbnew/dialogs/dialog_board_setup.cpp @@ -1,7 +1,7 @@ /* * This program source code file is part of KiCad, a free EDA CAD application. * - * Copyright (C) 2017-2019 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 2017-2020 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include @@ -41,7 +41,8 @@ #include "panel_setup_rules.h" DIALOG_BOARD_SETUP::DIALOG_BOARD_SETUP( PCB_EDIT_FRAME* aFrame ) : - PAGED_DIALOG( aFrame, _( "Board Setup" ), false, _( "Import Settings from Another Board..." ) ), + PAGED_DIALOG( aFrame, _( "Board Setup" ), false, + _( "Import Settings from Another Board..." ) ), m_frame( aFrame ) { BOARD* board = aFrame->GetBoard(); diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp index 5f8fe35bbd..ac92dcd984 100644 --- a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp +++ b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp @@ -4,7 +4,7 @@ * Copyright (C) 2018 Jean-Pierre Charras, jp.charras at wanadoo.fr * Copyright (C) 2015 Dick Hollenbeck, dick@softplc.com * Copyright (C) 2008 Wayne Stambaugh - * Copyright (C) 2004-2019 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 2004-2020 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -25,7 +25,7 @@ */ #include -#include +#include #include <3d_viewer/eda_3d_viewer.h> #include #include diff --git a/pcbnew/dialogs/dialog_footprint_properties.cpp b/pcbnew/dialogs/dialog_footprint_properties.cpp index e6cd70a61b..32510a2dfe 100644 --- a/pcbnew/dialogs/dialog_footprint_properties.cpp +++ b/pcbnew/dialogs/dialog_footprint_properties.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/pcbnew/dialogs/dialog_print_pcbnew.cpp b/pcbnew/dialogs/dialog_print_pcbnew.cpp index 72431de06e..4c837daddb 100644 --- a/pcbnew/dialogs/dialog_print_pcbnew.cpp +++ b/pcbnew/dialogs/dialog_print_pcbnew.cpp @@ -2,7 +2,7 @@ * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2010-2016 Jean-Pierre Charras, jean-pierre.charras at wanadoo.fr - * Copyright (C) 1992-2019 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 1992-2020 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 2018 CERN * Author: Maciej Suminski * @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include class DIALOG_PRINT_PCBNEW : public DIALOG_PRINT_GENERIC @@ -112,7 +112,8 @@ DIALOG_PRINT_PCBNEW::DIALOG_PRINT_PCBNEW( PCB_BASE_EDIT_FRAME* aParent, createExtraOptions(); createLeftPanel(); - m_outputMode->Bind( wxEVT_COMMAND_CHOICE_SELECTED, &DIALOG_PRINT_PCBNEW::onColorModeChanged, this ); + m_outputMode->Bind( wxEVT_COMMAND_CHOICE_SELECTED, &DIALOG_PRINT_PCBNEW::onColorModeChanged, + this ); } @@ -211,7 +212,8 @@ void DIALOG_PRINT_PCBNEW::createExtraOptions() wxDefaultPosition, wxDefaultSize, 0 ); optionsSizer->Add( m_checkUseTheme, wxGBPosition( rows++, 0 ), wxGBSpan( 1, 3 ), wxALL, 5 ); - m_checkUseTheme->Bind( wxEVT_COMMAND_CHECKBOX_CLICKED, &DIALOG_PRINT_PCBNEW::onUseThemeChecked, this ); + m_checkUseTheme->Bind( wxEVT_COMMAND_CHECKBOX_CLICKED, + &DIALOG_PRINT_PCBNEW::onUseThemeChecked, this ); wxArrayString m_colorThemeChoices; m_colorTheme = new wxChoice( sbOptionsSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, @@ -288,7 +290,8 @@ void DIALOG_PRINT_PCBNEW::createLeftPanel() // Select/Unselect all buttons m_buttonSelectAll = new wxButton( sbLayersSizer->GetStaticBox(), wxID_ANY, _( "Select all" ) ); - m_buttonDeselectAll = new wxButton( sbLayersSizer->GetStaticBox(), wxID_ANY, _( "Deselect all" ) ); + m_buttonDeselectAll = new wxButton( sbLayersSizer->GetStaticBox(), wxID_ANY, + _( "Deselect all" ) ); m_buttonSelectAll->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_PCBNEW::onSelectAllClick ), NULL, this ); @@ -301,7 +304,8 @@ void DIALOG_PRINT_PCBNEW::createLeftPanel() // Exclude Edge.Pcb layer checkbox - m_checkboxNoEdge = new wxCheckBox( sbLayersSizer->GetStaticBox(), wxID_ANY, _( "Exclude PCB edge layer" ) ); + m_checkboxNoEdge = new wxCheckBox( sbLayersSizer->GetStaticBox(), wxID_ANY, + _( "Exclude PCB edge layer" ) ); m_checkboxNoEdge->SetToolTip( _("Exclude contents of Edges_Pcb layer from all other layers") ); // Static box sizer layout diff --git a/pcbnew/dialogs/panel_setup_mask_and_paste.cpp b/pcbnew/dialogs/panel_setup_mask_and_paste.cpp index 8fd5e9abe6..c6ba14ccaa 100644 --- a/pcbnew/dialogs/panel_setup_mask_and_paste.cpp +++ b/pcbnew/dialogs/panel_setup_mask_and_paste.cpp @@ -1,7 +1,7 @@ /* * This program source code file is part of KiCad, a free EDA CAD application. * - * Copyright (C) 2019 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 2019-2020 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -24,7 +24,7 @@ #include #include -#include +#include #include @@ -32,7 +32,8 @@ PANEL_SETUP_MASK_AND_PASTE::PANEL_SETUP_MASK_AND_PASTE( PAGED_DIALOG* aParent, PCB_EDIT_FRAME* aFrame ) : PANEL_SETUP_MASK_AND_PASTE_BASE( aParent->GetTreebook() ), m_maskMargin( aFrame, m_MaskMarginLabel, m_MaskMarginCtrl, m_MaskMarginUnits, true ), - m_maskMinWidth( aFrame, m_MaskMinWidthLabel, m_MaskMinWidthCtrl, m_MaskMinWidthUnits, true ), + m_maskMinWidth( aFrame, m_MaskMinWidthLabel, m_MaskMinWidthCtrl, m_MaskMinWidthUnits, + true ), m_pasteMargin( aFrame, m_PasteMarginLabel, m_PasteMarginCtrl, m_PasteMarginUnits, true ) { m_Frame = aFrame; @@ -68,7 +69,6 @@ bool PANEL_SETUP_MASK_AND_PASTE::TransferDataToWindow() bool PANEL_SETUP_MASK_AND_PASTE::TransferDataFromWindow() { // These are all stored in project file, not board, so no need for OnModify() - m_BrdSettings->m_SolderMaskMargin = m_maskMargin.GetValue(); m_BrdSettings->m_SolderMaskMinWidth = m_maskMinWidth.GetValue(); diff --git a/pcbnew/footprint_libraries_utils.cpp b/pcbnew/footprint_libraries_utils.cpp index 3ac8761c96..645cbbf1a7 100644 --- a/pcbnew/footprint_libraries_utils.cpp +++ b/pcbnew/footprint_libraries_utils.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/pcbnew/microwave/microwave_footprint.cpp b/pcbnew/microwave/microwave_footprint.cpp index 65adc59136..c62fe9dc4e 100644 --- a/pcbnew/microwave/microwave_footprint.cpp +++ b/pcbnew/microwave/microwave_footprint.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include diff --git a/pcbnew/microwave/microwave_inductor.cpp b/pcbnew/microwave/microwave_inductor.cpp index b71a75791a..39def27828 100644 --- a/pcbnew/microwave/microwave_inductor.cpp +++ b/pcbnew/microwave/microwave_inductor.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include // for KiROUND #include diff --git a/pcbnew/microwave/microwave_polygon.cpp b/pcbnew/microwave/microwave_polygon.cpp index 014e160314..95a37ade07 100644 --- a/pcbnew/microwave/microwave_polygon.cpp +++ b/pcbnew/microwave/microwave_polygon.cpp @@ -3,7 +3,7 @@ * * Copyright (C) 2015 Jean-Pierre Charras, jp.charras at wanadoo.fr * Copyright (C) 2012 SoftPLC Corporation, Dick Hollenbeck - * Copyright (C) 2015-2016 Wayne Stambaugh + * Copyright (C) 2015-2016 Wayne Stambaugh * Copyright (C) 1992-2020 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/pcbnew/tools/pcb_selection_tool.cpp b/pcbnew/tools/pcb_selection_tool.cpp index 93f3473717..5d5f8f5b39 100644 --- a/pcbnew/tools/pcb_selection_tool.cpp +++ b/pcbnew/tools/pcb_selection_tool.cpp @@ -39,7 +39,7 @@ using namespace std::placeholders; #include #include #include -#include +#include #include #include #include