From f6b4b66a86ca5c97e6aac957414f44133755d9b3 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Sun, 18 Oct 2020 13:31:07 +0200 Subject: [PATCH] Avoid include wx/wx.h in many files that do not actually use this include. Including wx.h includes the full set of wxWidgets include files, that is not good, and can create some conflicts with some Windows headers on msys2. --- .../3d_cache/dialogs/dlg_select_3dmodel.cpp | 2 + common/bitmap.cpp | 3 + common/common.cpp | 1 + common/confirm.cpp | 1 + common/dialog_shim.cpp | 2 + common/dialogs/dialog_configure_paths.cpp | 1 + common/dialogs/dialog_edit_library_tables.cpp | 1 + common/dialogs/dialog_image_editor.cpp | 1 + common/dialogs/dialog_migrate_settings.cpp | 2 + common/dialogs/dialog_text_entry.h | 4 +- common/dialogs/panel_setup_severities.cpp | 1 + common/dialogs/panel_setup_severities.h | 2 +- common/eda_dde.cpp | 5 +- common/fp_lib_table.cpp | 2 + common/gal/opengl/opengl_gal.cpp | 2 + common/msgpanel.cpp | 3 + common/pgm_base.cpp | 1 + common/widgets/grid_text_button_helpers.cpp | 15 ++- common/widgets/widget_hotkey_list.cpp | 2 + .../gen_gerber_and_drill_files_board.py | 2 +- eeschema/sch_validators.cpp | 4 +- eeschema/sim/ngspice.cpp | 1 + gerbview/DCodeSelectionbox.h | 2 + include/class_board_item.h | 2 + include/gal/color4d.h | 3 +- include/gr_basic.h | 2 + include/kiway_player.h | 2 + include/msgpanel.h | 1 + include/painter.h | 2 + include/render_settings.h | 2 + include/widgets/ui_common.h | 3 +- kicad/dialogs/dialog_template_selector.cpp | 1 + kicad/kicad.cpp | 2 +- .../dialog_dielectric_list_manager.cpp | 2 +- pcbnew/dialogs/dialog_imported_layers.cpp | 2 + pcbnew/swig/python_scripting.cpp | 2 + qa/drc_proto/drc_proto_test.cpp | 2 + qa/qa_utils/mock_pgm.cpp | 2 + qa/qa_utils/mocks.cpp | 119 +++++++++--------- 39 files changed, 131 insertions(+), 78 deletions(-) diff --git a/3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.cpp b/3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.cpp index 90385dc2fa..576910e731 100644 --- a/3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.cpp +++ b/3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.cpp @@ -35,6 +35,8 @@ #include #include +#include + #include diff --git a/common/bitmap.cpp b/common/bitmap.cpp index 0c7d0a1e20..fcbbcf43db 100644 --- a/common/bitmap.cpp +++ b/common/bitmap.cpp @@ -29,6 +29,9 @@ #include #include #include +#include +#include +#include #include #include diff --git a/common/common.cpp b/common/common.cpp index 24f3998ef1..b9c292ced2 100644 --- a/common/common.cpp +++ b/common/common.cpp @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include diff --git a/common/confirm.cpp b/common/confirm.cpp index 75ed4e6d66..fa430cbea3 100644 --- a/common/confirm.cpp +++ b/common/confirm.cpp @@ -24,6 +24,7 @@ #include #include +#include #include #include #include diff --git a/common/dialog_shim.cpp b/common/dialog_shim.cpp index 9377a68a12..5a4af12846 100644 --- a/common/dialog_shim.cpp +++ b/common/dialog_shim.cpp @@ -32,6 +32,8 @@ #include #include +#include +#include #include #include diff --git a/common/dialogs/dialog_configure_paths.cpp b/common/dialogs/dialog_configure_paths.cpp index ae51f31bcb..2cddd6544d 100644 --- a/common/dialogs/dialog_configure_paths.cpp +++ b/common/dialogs/dialog_configure_paths.cpp @@ -35,6 +35,7 @@ #include #include +#include enum TEXT_VAR_GRID_COLUMNS { diff --git a/common/dialogs/dialog_edit_library_tables.cpp b/common/dialogs/dialog_edit_library_tables.cpp index 250d498240..a2ac607a56 100644 --- a/common/dialogs/dialog_edit_library_tables.cpp +++ b/common/dialogs/dialog_edit_library_tables.cpp @@ -18,6 +18,7 @@ */ #include +#include #include "dialog_edit_library_tables.h" diff --git a/common/dialogs/dialog_image_editor.cpp b/common/dialogs/dialog_image_editor.cpp index 9372066d0d..e30e6edf46 100644 --- a/common/dialogs/dialog_image_editor.cpp +++ b/common/dialogs/dialog_image_editor.cpp @@ -22,6 +22,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ +#include #include #include diff --git a/common/dialogs/dialog_migrate_settings.cpp b/common/dialogs/dialog_migrate_settings.cpp index 434ac276a6..a97156c7d0 100644 --- a/common/dialogs/dialog_migrate_settings.cpp +++ b/common/dialogs/dialog_migrate_settings.cpp @@ -22,6 +22,8 @@ #include #include +#include + DIALOG_MIGRATE_SETTINGS::DIALOG_MIGRATE_SETTINGS( SETTINGS_MANAGER* aManager ) : DIALOG_MIGRATE_SETTINGS_BASE( nullptr ), m_manager( aManager ) diff --git a/common/dialogs/dialog_text_entry.h b/common/dialogs/dialog_text_entry.h index 9ae0cdcb3e..ad50c0b488 100644 --- a/common/dialogs/dialog_text_entry.h +++ b/common/dialogs/dialog_text_entry.h @@ -32,9 +32,7 @@ #define _DIALOG_TEXT_ENTRY_H_ #include - - -class wxTextValidator; +#include class WX_TEXT_ENTRY_DIALOG : public WX_TEXT_ENTRY_DIALOG_BASE diff --git a/common/dialogs/panel_setup_severities.cpp b/common/dialogs/panel_setup_severities.cpp index ef04988b3c..79092b8d2c 100644 --- a/common/dialogs/panel_setup_severities.cpp +++ b/common/dialogs/panel_setup_severities.cpp @@ -25,6 +25,7 @@ #include #include #include "panel_setup_severities.h" +#include PANEL_SETUP_SEVERITIES::PANEL_SETUP_SEVERITIES( PAGED_DIALOG* aParent, diff --git a/common/dialogs/panel_setup_severities.h b/common/dialogs/panel_setup_severities.h index 007d811d7e..f3c5f44495 100644 --- a/common/dialogs/panel_setup_severities.h +++ b/common/dialogs/panel_setup_severities.h @@ -28,10 +28,10 @@ #include #include - class PAGED_DIALOG; class EDA_DRAW_FRAME; class wxRadioBox; +class wxRadioButton; class PANEL_SETUP_SEVERITIES : public wxPanel diff --git a/common/eda_dde.cpp b/common/eda_dde.cpp index 2a7f4bec27..56ed7a87e1 100644 --- a/common/eda_dde.cpp +++ b/common/eda_dde.cpp @@ -26,12 +26,11 @@ * @file eda_dde.cpp */ -//#include #include #include #include -//#include -//#include + +#include static const wxString HOSTNAME( wxT( "localhost" ) ); diff --git a/common/fp_lib_table.cpp b/common/fp_lib_table.cpp index 8fbd21284d..18a775c024 100644 --- a/common/fp_lib_table.cpp +++ b/common/fp_lib_table.cpp @@ -35,6 +35,8 @@ #include #include +#include + #define OPT_SEP '|' ///< options separator character using namespace LIB_TABLE_T; diff --git a/common/gal/opengl/opengl_gal.cpp b/common/gal/opengl/opengl_gal.cpp index 36604ec127..d1c18b2b85 100644 --- a/common/gal/opengl/opengl_gal.cpp +++ b/common/gal/opengl/opengl_gal.cpp @@ -44,6 +44,8 @@ #include #include // for KiROUND +#include + #include #ifdef __WXDEBUG__ diff --git a/common/msgpanel.cpp b/common/msgpanel.cpp index 91b1b3b7d4..b6cf213ee7 100644 --- a/common/msgpanel.cpp +++ b/common/msgpanel.cpp @@ -30,6 +30,9 @@ #include +#include +#include + BEGIN_EVENT_TABLE( EDA_MSG_PANEL, wxPanel ) EVT_PAINT( EDA_MSG_PANEL::OnPaint ) diff --git a/common/pgm_base.cpp b/common/pgm_base.cpp index 3548d954b3..70ed07fcd3 100644 --- a/common/pgm_base.cpp +++ b/common/pgm_base.cpp @@ -38,6 +38,7 @@ #include #include #include +#include #include #include diff --git a/common/widgets/grid_text_button_helpers.cpp b/common/widgets/grid_text_button_helpers.cpp index 5e2bc2bc1f..a8170fd61b 100644 --- a/common/widgets/grid_text_button_helpers.cpp +++ b/common/widgets/grid_text_button_helpers.cpp @@ -22,6 +22,9 @@ */ #include +#include +#include + #include #include #include @@ -315,7 +318,7 @@ class TEXT_BUTTON_FILE_BROWSER : public wxComboCtrl { public: TEXT_BUTTON_FILE_BROWSER( wxWindow* aParent, DIALOG_SHIM* aParentDlg, - wxString* aCurrentDir, wxString* aExt = nullptr, + wxString* aCurrentDir, wxString* aExt = nullptr, bool aNormalize = false, wxString aNormalizeBasePath = wxEmptyString ) : wxComboCtrl( aParent ), m_dlg( aParentDlg ), @@ -356,9 +359,9 @@ protected: if( m_normalize ) { - relPath = NormalizePath( filePath, &Pgm().GetLocalEnvVariables(), + relPath = NormalizePath( filePath, &Pgm().GetLocalEnvVariables(), m_normalizeBasePath ); - lastPath = NormalizePath( dlg.GetDirectory(), &Pgm().GetLocalEnvVariables(), + lastPath = NormalizePath( dlg.GetDirectory(), &Pgm().GetLocalEnvVariables(), m_normalizeBasePath ); } @@ -381,7 +384,7 @@ protected: if ( m_normalize ) { - relPath = NormalizePath( filePath, &Pgm().GetLocalEnvVariables(), + relPath = NormalizePath( filePath, &Pgm().GetLocalEnvVariables(), m_normalizeBasePath ); } @@ -406,10 +409,10 @@ void GRID_CELL_PATH_EDITOR::Create( wxWindow* aParent, wxWindowID aId, wxEvtHandler* aEventHandler ) { if( m_ext.IsEmpty() ) - m_control = new TEXT_BUTTON_FILE_BROWSER( aParent, m_dlg, m_currentDir, nullptr, + m_control = new TEXT_BUTTON_FILE_BROWSER( aParent, m_dlg, m_currentDir, nullptr, m_normalize, m_normalizeBasePath ); else - m_control = new TEXT_BUTTON_FILE_BROWSER( aParent, m_dlg, m_currentDir, &m_ext, + m_control = new TEXT_BUTTON_FILE_BROWSER( aParent, m_dlg, m_currentDir, &m_ext, m_normalize, m_normalizeBasePath ); #if wxUSE_VALIDATORS diff --git a/common/widgets/widget_hotkey_list.cpp b/common/widgets/widget_hotkey_list.cpp index 5c501b4965..22bd01c489 100644 --- a/common/widgets/widget_hotkey_list.cpp +++ b/common/widgets/widget_hotkey_list.cpp @@ -26,6 +26,8 @@ #include #include #include +#include +#include #include #include diff --git a/demos/python_scripts_examples/gen_gerber_and_drill_files_board.py b/demos/python_scripts_examples/gen_gerber_and_drill_files_board.py index 30f56bc057..18f1483acf 100644 --- a/demos/python_scripts_examples/gen_gerber_and_drill_files_board.py +++ b/demos/python_scripts_examples/gen_gerber_and_drill_files_board.py @@ -41,7 +41,7 @@ popt.SetOutputDirectory(plotDir) # Set some important plot options (see pcb_plot_params.h): popt.SetPlotFrameRef(False) #do not change it -popt.SetLineWidth(FromMM(0.35)) +popt.SetSketchPadLineWidth(FromMM(0.1)) popt.SetAutoScale(False) #do not change it popt.SetScale(1) #do not change it diff --git a/eeschema/sch_validators.cpp b/eeschema/sch_validators.cpp index 5c6b447f73..66ed03e664 100644 --- a/eeschema/sch_validators.cpp +++ b/eeschema/sch_validators.cpp @@ -27,8 +27,10 @@ * @brief Implementation of control validators for schematic dialogs. */ -#include #include +#include + +#include #include #include #include diff --git a/eeschema/sim/ngspice.cpp b/eeschema/sim/ngspice.cpp index 6cf1a2a932..269c8e4278 100644 --- a/eeschema/sim/ngspice.cpp +++ b/eeschema/sim/ngspice.cpp @@ -26,6 +26,7 @@ */ #include // Needed for MSW compilation +#include #include "ngspice.h" #include "spice_reporter.h" diff --git a/gerbview/DCodeSelectionbox.h b/gerbview/DCodeSelectionbox.h index 5ae98b0f14..077e3ccfd6 100644 --- a/gerbview/DCodeSelectionbox.h +++ b/gerbview/DCodeSelectionbox.h @@ -27,6 +27,8 @@ #ifndef DCODESELECTIONBOX_H #define DCODESELECTIONBOX_H +#include + /* helper class to display a DCode list and select a DCode id. */ diff --git a/include/class_board_item.h b/include/class_board_item.h index 3a95bb4a07..eda2939f32 100644 --- a/include/class_board_item.h +++ b/include/class_board_item.h @@ -38,6 +38,8 @@ #include #include +#include + class BOARD; class BOARD_ITEM_CONTAINER; class SHAPE_POLY_SET; diff --git a/include/gal/color4d.h b/include/gal/color4d.h index 1423e7b98f..d7b27a3a66 100644 --- a/include/gal/color4d.h +++ b/include/gal/color4d.h @@ -31,7 +31,8 @@ #include #ifdef WX_COMPATIBILITY -#include +#include +#include #endif /** diff --git a/include/gr_basic.h b/include/gr_basic.h index 5db694bb4c..56457c5cd6 100644 --- a/include/gr_basic.h +++ b/include/gr_basic.h @@ -29,6 +29,8 @@ #include #include #include +#include +#include using KIGFX::COLOR4D; diff --git a/include/kiway_player.h b/include/kiway_player.h index 2b2a68e3cf..1ac7eabaeb 100644 --- a/include/kiway_player.h +++ b/include/kiway_player.h @@ -26,6 +26,8 @@ #define KIWAY_PLAYER_H_ #include +#include + #include #include #include diff --git a/include/msgpanel.h b/include/msgpanel.h index a5ea8e7cc9..58a2f9a408 100644 --- a/include/msgpanel.h +++ b/include/msgpanel.h @@ -35,6 +35,7 @@ #include #include +#include #include diff --git a/include/painter.h b/include/painter.h index e050d69078..d7f49d86e2 100644 --- a/include/painter.h +++ b/include/painter.h @@ -30,6 +30,8 @@ #include #include +#include + #include #include #include diff --git a/include/render_settings.h b/include/render_settings.h index 9405ccdd1c..f42fd96252 100644 --- a/include/render_settings.h +++ b/include/render_settings.h @@ -31,6 +31,8 @@ #include #include +#include + class COLOR_SETTINGS; namespace KIGFX diff --git a/include/widgets/ui_common.h b/include/widgets/ui_common.h index f2e17abb95..64a4a4e9d3 100644 --- a/include/widgets/ui_common.h +++ b/include/widgets/ui_common.h @@ -26,8 +26,9 @@ #ifndef UI_COMMON_H #define UI_COMMON_H -#include +#include +class wxWindow; namespace KIUI { diff --git a/kicad/dialogs/dialog_template_selector.cpp b/kicad/dialogs/dialog_template_selector.cpp index 6d17dd2588..e182d6b873 100644 --- a/kicad/dialogs/dialog_template_selector.cpp +++ b/kicad/dialogs/dialog_template_selector.cpp @@ -25,6 +25,7 @@ #include "dialog_template_selector.h" #include +#include #include diff --git a/kicad/kicad.cpp b/kicad/kicad.cpp index 3b712c7e75..7b9e0ec2eb 100644 --- a/kicad/kicad.cpp +++ b/kicad/kicad.cpp @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include diff --git a/pcbnew/board_stackup_manager/dialog_dielectric_list_manager.cpp b/pcbnew/board_stackup_manager/dialog_dielectric_list_manager.cpp index 1730c77f04..4f6bfd4d11 100644 --- a/pcbnew/board_stackup_manager/dialog_dielectric_list_manager.cpp +++ b/pcbnew/board_stackup_manager/dialog_dielectric_list_manager.cpp @@ -23,7 +23,7 @@ */ #include "dialog_dielectric_list_manager.h" - +#include DIALOG_DIELECTRIC_MATERIAL::DIALOG_DIELECTRIC_MATERIAL( wxWindow* aParent, DIELECTRIC_SUBSTRATE_LIST& aMaterialList ) diff --git a/pcbnew/dialogs/dialog_imported_layers.cpp b/pcbnew/dialogs/dialog_imported_layers.cpp index 8f40fe97f9..ea6194bffe 100644 --- a/pcbnew/dialogs/dialog_imported_layers.cpp +++ b/pcbnew/dialogs/dialog_imported_layers.cpp @@ -22,6 +22,8 @@ #include #include +#include + PCB_LAYER_ID DIALOG_IMPORTED_LAYERS::GetSelectedLayerID() { diff --git a/pcbnew/swig/python_scripting.cpp b/pcbnew/swig/python_scripting.cpp index cf4471f393..f3ee847672 100644 --- a/pcbnew/swig/python_scripting.cpp +++ b/pcbnew/swig/python_scripting.cpp @@ -39,6 +39,8 @@ #include #include +#include + /* init functions defined by swig */ #if PY_MAJOR_VERSION >= 3 diff --git a/qa/drc_proto/drc_proto_test.cpp b/qa/drc_proto/drc_proto_test.cpp index 0404cbd99e..21054d007a 100644 --- a/qa/drc_proto/drc_proto_test.cpp +++ b/qa/drc_proto/drc_proto_test.cpp @@ -27,6 +27,8 @@ #include #include +#include + #include #include diff --git a/qa/qa_utils/mock_pgm.cpp b/qa/qa_utils/mock_pgm.cpp index 9f6329ee44..5dda3f69fe 100644 --- a/qa/qa_utils/mock_pgm.cpp +++ b/qa/qa_utils/mock_pgm.cpp @@ -26,6 +26,8 @@ #include #include +#include + static struct IFACE : public KIFACE_I { diff --git a/qa/qa_utils/mocks.cpp b/qa/qa_utils/mocks.cpp index 1f2c9e26a8..263b6fd28e 100644 --- a/qa/qa_utils/mocks.cpp +++ b/qa/qa_utils/mocks.cpp @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -318,25 +319,25 @@ EDA_3D_VIEWER::EDA_3D_VIEWER( KIWAY *aKiway, PCB_BASE_FRAME *aParent, const wxSt m_currentCamera( m_trackBallCamera ), m_trackBallCamera( RANGE_SCALE_3D ) { - + } EDA_3D_VIEWER::~EDA_3D_VIEWER() { - + } void EDA_3D_VIEWER::setupUIConditions() { - + } void EDA_3D_VIEWER::ReloadRequest() { - + } @@ -348,80 +349,80 @@ void EDA_3D_VIEWER::NewDisplay( bool aForceImmediateRedraw ) void EDA_3D_VIEWER::Exit3DFrame( wxCommandEvent &event ) { - + } void EDA_3D_VIEWER::OnCloseWindow( wxCloseEvent &event ) { - + } void EDA_3D_VIEWER::Process_Special_Functions( wxCommandEvent &event ) { - + } void EDA_3D_VIEWER::OnRenderEngineSelection( wxCommandEvent &event ) { - + } void EDA_3D_VIEWER::OnDisableRayTracing( wxCommandEvent& aEvent ) { - + } void EDA_3D_VIEWER::OnActivate( wxActivateEvent &event ) { - + } void EDA_3D_VIEWER::OnSetFocus(wxFocusEvent &event) { - + } void EDA_3D_VIEWER::LoadSettings( APP_SETTINGS_BASE *aCfg ) { - + } void EDA_3D_VIEWER::SaveSettings( APP_SETTINGS_BASE *aCfg ) { - + } void EDA_3D_VIEWER::SynchroniseColoursWithBoard() { - + } void EDA_3D_VIEWER::CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged ) { - + } void EDA_3D_VIEWER::takeScreenshot( wxCommandEvent& event ) { - + } void EDA_3D_VIEWER::RenderEngineChanged() { - + } @@ -430,7 +431,7 @@ bool EDA_3D_VIEWER::Set3DColorFromUser( SFVEC4F &aColor, const wxString& aTitle, bool aAllowOpacityControl, KIGFX::COLOR4D aDefaultColor ) { - + return true; } @@ -480,7 +481,7 @@ SELECTION_TOOL::SELECTION_TOOL() : m_enteredGroup( NULL ), m_priv( nullptr ) { - + } @@ -491,33 +492,33 @@ SELECTION_TOOL::~SELECTION_TOOL() bool SELECTION_TOOL::Init() { - + return true; } void SELECTION_TOOL::Reset( RESET_REASON aReason ) { - + } int SELECTION_TOOL::Main( const TOOL_EVENT& aEvent ) { - + return 0; } void SELECTION_TOOL::EnterGroup() { - + } void SELECTION_TOOL::ExitGroup( bool aSelectGroup ) { - + } @@ -531,7 +532,7 @@ PCBNEW_SELECTION& SELECTION_TOOL::RequestSelection( CLIENT_SELECTION_FILTER aCli std::vector* aFiltered, bool aConfirmLockedItems ) { - + return m_selection; } @@ -546,7 +547,7 @@ bool SELECTION_TOOL::selectPoint( const VECTOR2I& aWhere, bool aOnDrag, bool* aSelectionCancelledFlag, CLIENT_SELECTION_FILTER aClientFilter ) { - + return false; } @@ -561,14 +562,14 @@ bool SELECTION_TOOL::selectCursor( bool aForceSelect, CLIENT_SELECTION_FILTER aC bool SELECTION_TOOL::selectMultiple() { - + return false; } SELECTION_LOCK_FLAGS SELECTION_TOOL::CheckLock() { - + return SELECTION_UNLOCKED; } @@ -589,7 +590,7 @@ int SELECTION_TOOL::ClearSelection( const TOOL_EVENT& aEvent ) int SELECTION_TOOL::SelectItems( const TOOL_EVENT& aEvent ) { - + return 0; } @@ -602,7 +603,7 @@ int SELECTION_TOOL::SelectItem( const TOOL_EVENT& aEvent ) int SELECTION_TOOL::SelectAll( const TOOL_EVENT& aEvent ) { - + return 0; } @@ -610,13 +611,13 @@ int SELECTION_TOOL::SelectAll( const TOOL_EVENT& aEvent ) void SELECTION_TOOL::AddItemToSel( BOARD_ITEM* aItem, bool aQuietMode ) { - + } int SELECTION_TOOL::UnselectItems( const TOOL_EVENT& aEvent ) { - + return 0; } @@ -629,7 +630,7 @@ int SELECTION_TOOL::UnselectItem( const TOOL_EVENT& aEvent ) void SELECTION_TOOL::RemoveItemFromSel( BOARD_ITEM* aItem, bool aQuietMode ) { - + } @@ -647,7 +648,7 @@ void SELECTION_TOOL::UnbrightenItem( BOARD_ITEM* aItem ) int SELECTION_TOOL::expandConnection( const TOOL_EVENT& aEvent ) { - + return 0; } @@ -655,58 +656,58 @@ int SELECTION_TOOL::expandConnection( const TOOL_EVENT& aEvent ) void SELECTION_TOOL::selectConnectedTracks( BOARD_CONNECTED_ITEM& aStartItem, STOP_CONDITION aStopCondition ) { - + } void SELECTION_TOOL::selectAllItemsOnNet( int aNetCode, bool aSelect ) { - + } int SELECTION_TOOL::selectNet( const TOOL_EVENT& aEvent ) { - + return 0; } void SELECTION_TOOL::selectAllItemsOnSheet( wxString& aSheetPath ) { - + } void SELECTION_TOOL::zoomFitSelection() { - + } int SELECTION_TOOL::selectSheetContents( const TOOL_EVENT& aEvent ) { - + return 0; } int SELECTION_TOOL::selectSameSheet( const TOOL_EVENT& aEvent ) { - + return 0; } void SELECTION_TOOL::findCallback( BOARD_ITEM* aItem ) { - + } int SELECTION_TOOL::find( const TOOL_EVENT& aEvent ) { - + return 0; } @@ -721,7 +722,7 @@ int SELECTION_TOOL::find( const TOOL_EVENT& aEvent ) static bool itemIsIncludedByFilter( const BOARD_ITEM& aItem, const BOARD& aBoard, const DIALOG_FILTER_SELECTION::OPTIONS& aFilterOptions ) { - + return false; } @@ -729,20 +730,20 @@ static bool itemIsIncludedByFilter( const BOARD_ITEM& aItem, const BOARD& aBoard int SELECTION_TOOL::filterSelection( const TOOL_EVENT& aEvent ) { - + return 0; } void SELECTION_TOOL::FilterCollectedItems( GENERAL_COLLECTOR& aCollector ) { - + } bool SELECTION_TOOL::itemPassesFilter( BOARD_ITEM* aItem ) { - + return true; } @@ -750,13 +751,13 @@ bool SELECTION_TOOL::itemPassesFilter( BOARD_ITEM* aItem ) void SELECTION_TOOL::ClearSelection( bool aQuietMode ) { - + } void SELECTION_TOOL::RebuildSelection() { - + } @@ -787,41 +788,41 @@ bool SELECTION_TOOL::Selectable( const BOARD_ITEM* aItem, bool checkVisibilityOn void SELECTION_TOOL::select( BOARD_ITEM* aItem ) { - + } void SELECTION_TOOL::unselect( BOARD_ITEM* aItem ) { - + } void SELECTION_TOOL::highlight( BOARD_ITEM* aItem, int aMode, PCBNEW_SELECTION* aGroup ) { - + } void SELECTION_TOOL::highlightInternal( BOARD_ITEM* aItem, int aMode, PCBNEW_SELECTION* aGroup, bool isChild ) { - + } void SELECTION_TOOL::unhighlight( BOARD_ITEM* aItem, int aMode, PCBNEW_SELECTION* aGroup ) { - + } void SELECTION_TOOL::unhighlightInternal( BOARD_ITEM* aItem, int aMode, PCBNEW_SELECTION* aGroup, bool isChild ) { - + } bool SELECTION_TOOL::selectionContains( const VECTOR2I& aPoint ) const { - + return false; } @@ -829,13 +830,13 @@ bool SELECTION_TOOL::selectionContains( const VECTOR2I& aPoint ) const void SELECTION_TOOL::GuessSelectionCandidates( GENERAL_COLLECTOR& aCollector, const VECTOR2I& aWhere ) const { - + } void SELECTION_TOOL::FilterCollectorForGroups( GENERAL_COLLECTOR& aCollector ) const { - + } @@ -848,7 +849,7 @@ int SELECTION_TOOL::updateSelection( const TOOL_EVENT& aEvent ) int SELECTION_TOOL::UpdateMenu( const TOOL_EVENT& aEvent ) { - + return 0; }