Stop salt the eart with wxhtml.h

common/dialog_shim.cpp

@@ -35,6 +35,7 @@
 #include <wx/event.h>
 #include <wx/grid.h>
 #include <wx/bmpbuttn.h>
+#include <wx/textctrl.h>
 
 #include <algorithm>
 

common/dialogs/dialog_print_generic.cpp

@@ -24,6 +24,8 @@
 #include <printout.h>
 #include <pgm_base.h>
 
+#include <wx/printdlg.h>
+
 // Define min and max reasonable values for print scale
 static constexpr double MIN_SCALE = 0.01;
 static constexpr double MAX_SCALE = 100.0;

common/dialogs/panel_setup_severities.cpp

@@ -26,6 +26,7 @@
 #include <rc_item.h>
 #include <dialogs/panel_setup_severities.h>
 #include <wx/radiobut.h>
+#include <wx/stattext.h>
 
 
 PANEL_SETUP_SEVERITIES::PANEL_SETUP_SEVERITIES( PAGED_DIALOG* aParent,

common/widgets/grid_color_swatch_helpers.cpp

@@ -25,6 +25,7 @@
 
 #include <settings/color_settings.h>
 #include <dialogs/dialog_color_picker.h>
+#include <wx/checkbox.h>
 
 
 //-------- Custom wxGridCellRenderers --------------------------------------------------

common/widgets/grid_text_button_helpers.cpp

@@ -25,6 +25,7 @@
 #include <wx/combo.h>
 #include <wx/filedlg.h>
 #include <wx/dirdlg.h>
+#include <wx/textctrl.h>
 
 #include <bitmaps.h>
 #include <kiway.h>

common/widgets/widget_hotkey_list.cpp

@@ -31,6 +31,7 @@
 #include <tool/tool_action.h>
 #include <dialog_shim.h>
 #include <wx/dcclient.h>
+#include <wx/stattext.h>
 
 /**
  * Menu IDs for the hotkey context menu

cvpcb/cvpcb_mainframe.cpp

@@ -41,6 +41,7 @@
 #include <tool/tool_manager.h>
 #include <widgets/progress_reporter.h>
 #include <wx/statline.h>
+#include <wx/stattext.h>
 
 #include <cvpcb_association.h>
 #include <cvpcb_id.h>

cvpcb/display_footprints_frame.cpp

@@ -54,6 +54,7 @@
 #include <tools/pcb_viewer_tools.h>       // shared tools with other pcbnew frames
 #include <tools/cvpcb_fpviewer_selection_tool.h>
 #include <widgets/infobar.h>
+#include <wx/choice.h>
 #include <wx/debug.h>
 
 

cvpcb/toolbars_cvpcb.cpp

@@ -30,6 +30,7 @@
 #include <cvpcb_id.h>
 #include <cvpcb_mainframe.h>
 #include <tools/cvpcb_actions.h>
+#include <wx/stattext.h>
 
 
 void CVPCB_MAINFRAME::ReCreateHToolbar()

eeschema/dialogs/dialog_bus_manager.cpp

@@ -27,6 +27,7 @@
 #include "dialog_bus_manager.h"
 
 #include <wx/button.h>
+#include <wx/stattext.h>
 #include <wx/valtext.h>
 
 

eeschema/dialogs/dialog_choose_symbol.cpp

@@ -34,6 +34,7 @@
 #include <widgets/lib_tree.h>
 #include <widgets/symbol_preview_widget.h>
 #include <wx/button.h>
+#include <wx/checkbox.h>
 #include <wx/clipbrd.h>
 #include <wx/dataview.h>
 #include <wx/panel.h>
@@ -41,6 +42,7 @@
 #include <wx/splitter.h>
 #include <wx/timer.h>
 #include <wx/utils.h>
+#include <wx/wxhtml.h>
 
 std::mutex DIALOG_CHOOSE_SYMBOL::g_Mutex;
 
@@ -553,3 +555,13 @@ void DIALOG_CHOOSE_SYMBOL::OnComponentSelected( wxCommandEvent& aEvent )
 }
 
 
+bool DIALOG_CHOOSE_SYMBOL::GetUseAllUnits() const
+{
+    return m_useUnits->GetValue();
+}
+
+
+bool DIALOG_CHOOSE_SYMBOL::GetKeepSymbol() const
+{
+    return m_keepSymbol->GetValue();
+}

eeschema/dialogs/dialog_choose_symbol.h

@@ -28,6 +28,7 @@
 #include <symbol_tree_model_adapter.h>
 #include <footprint_info.h>
 
+class wxCheckBox;
 class wxStaticBitmap;
 class wxTextCtrl;
 class wxStdDialogButtonSizer;
@@ -38,6 +39,7 @@ class wxPanel;
 class wxChoice;
 class wxButton;
 class wxTimer;
+class wxSplitterWindow;
 
 class LIB_TREE;
 class SYMBOL_PREVIEW_WIDGET;
@@ -130,7 +132,7 @@ public:
      *
      * @return The value of the dialog preference checkbox.
      */
-    bool GetUseAllUnits() const { return m_useUnits->GetValue(); }
+    bool GetUseAllUnits() const;
 
     /**
      * To be called after this dialog returns from ShowModal()
@@ -140,7 +142,7 @@ public:
      *
      * @return The value of the keep symbol preference checkbox.
      */
-    bool GetKeepSymbol() const { return m_keepSymbol->GetValue(); }
+    bool GetKeepSymbol() const;
 
     /**
      * Get a list of fields edited by the user.

eeschema/dialogs/dialog_netlist.cpp

@@ -48,9 +48,10 @@
 #include <paths.h>
 
 #include <eeschema_id.h>
-#include <wx/regex.h>
+#include <wx/checkbox.h>
 #include <wx/filedlg.h>
 #include <wx/msgdlg.h>
+#include <wx/regex.h>
 
 
 

eeschema/dialogs/dialog_print_using_printer.cpp

@@ -34,6 +34,7 @@
 #include <sch_sheet_path.h>
 #include <dialog_print_using_printer_base.h>
 #include <sch_painter.h>
+#include <wx/printdlg.h>
 
 class DIALOG_PRINT_USING_PRINTER : public DIALOG_PRINT_USING_PRINTER_BASE
 {

eeschema/dialogs/panel_setup_pinmap.cpp

@@ -35,6 +35,7 @@
 #include <id.h>
 #include <wx/bmpbuttn.h>
 #include <wx/statline.h>
+#include <wx/stattext.h>
 
 
 // Control identifiers for events

eeschema/symbol_viewer_frame.cpp

@@ -52,6 +52,7 @@
 #include <tools/symbol_editor_control.h>
 #include <tools/ee_inspection_tool.h>
 #include <view/view_controls.h>
+#include <wx/listbox.h>
 
 #include <default_values.h>
 

eeschema/widgets/symbol_preview_widget.cpp

@@ -27,6 +27,7 @@
 #include <eda_draw_frame.h>
 #include <eeschema_settings.h>
 #include <settings/settings_manager.h>
+#include <wx/stattext.h>
 
 
 SYMBOL_PREVIEW_WIDGET::SYMBOL_PREVIEW_WIDGET( wxWindow* aParent, KIWAY& aKiway,

include/eda_base_frame.h

@@ -36,7 +36,6 @@
 
 #include <wx/socket.h>
 #include <wx/log.h>
-#include <wx/wxhtml.h>
 #include <wx/laywin.h>
 #include <wx/aui/aui.h>
 #include <wx/docview.h>

kicad/dialogs/panel_kicad_launcher.cpp

@@ -22,6 +22,7 @@
 #include <tool/tool_manager.h>
 #include <tools/kicad_manager_actions.h>
 #include <widgets/bitmap_button.h>
+#include <wx/stattext.h>
 
 #include "panel_kicad_launcher.h"
 

kicad/tools/kicad_manager_control.cpp

@@ -30,6 +30,7 @@
 #include <tools/kicad_manager_control.h>
 #include <dialogs/dialog_template_selector.h>
 #include <gestfich.h>
+#include <wx/checkbox.h>
 #include <wx/dir.h>
 #include <wx/filedlg.h>
 

pagelayout_editor/pl_editor_frame.cpp

@@ -919,3 +919,9 @@ void PL_EDITOR_FRAME::ClearUndoORRedoList( UNDO_REDO_LIST whichList, int aItemCo
         delete curr_cmd;    // Delete command
     }
 }
+
+
+bool PL_EDITOR_FRAME::GetPageNumberOption() const
+{
+    return m_pageSelectBox->GetSelection() == 0;
+}

pagelayout_editor/pl_editor_frame.h

@@ -36,6 +36,7 @@
 class PL_DRAW_PANEL_GAL;
 class PROPERTIES_FRAME;
 class DS_DATA_ITEM;
+class wxChoice;
 
 
 /**
@@ -173,10 +174,7 @@ public:
      * looks like word processing option "page 1 differs from other pages").
      * @return true if the page 1 is selected, and false if not
      */
-    bool GetPageNumberOption() const
+    bool GetPageNumberOption() const;
-    {
-        return m_pageSelectBox->GetSelection() == 0;
-    }
 
     /**
      * Displays the short filename (if exists) loaded file on the caption of the main window

pagelayout_editor/toolbars_pl_editor.cpp

@@ -21,6 +21,7 @@
 
 #include <bitmaps.h>
 #include <tool/action_toolbar.h>
+#include <wx/choice.h>
 
 #include "pl_editor_id.h"
 #include "pl_editor_frame.h"

pcbnew/dialogs/dialog_choose_footprint.cpp

@@ -30,6 +30,7 @@
 #include <wx/sizer.h>
 #include <wx/splitter.h>
 #include <wx/timer.h>
+#include <wx/wxhtml.h>
 #include <pcb_base_frame.h>
 #include <pcbnew_settings.h>
 #include <pgm_base.h>

pcbnew/dialogs/dialog_choose_footprint.h

@@ -39,6 +39,7 @@ class wxPanel;
 class wxChoice;
 class wxButton;
 class wxTimer;
+class wxSplitterWindow;
 
 class PCB_BASE_FRAME;
 class LIB_TREE;

pcbnew/dialogs/dialog_constraints_reporter.cpp

@@ -26,6 +26,7 @@
 #include <tool/tool_manager.h>
 #include <wx_html_report_box.h>
 #include <tools/pcb_actions.h>
+#include <wx/wxhtml.h>
 
 DIALOG_CONSTRAINTS_REPORTER::DIALOG_CONSTRAINTS_REPORTER( PCB_EDIT_FRAME* aParent ) :
         DIALOG_CONSTRAINTS_REPORTER_BASE( aParent ),

pcbnew/dialogs/dialog_constraints_reporter.h

@@ -28,7 +28,7 @@
 
 class PCB_EDIT_FRAME;
 class WX_HTML_REPORT_BOX;
-
+class wxHtmlLinkEvent;
 
 class DIALOG_CONSTRAINTS_REPORTER : public DIALOG_CONSTRAINTS_REPORTER_BASE
 {

pcbnew/dialogs/dialog_gencad_export_options.cpp

@@ -31,6 +31,7 @@
 #include <project.h>
 #include <confirm.h>
 #include <wildcards_and_files_ext.h>
+#include <wx/checkbox.h>
 #include <wx/filepicker.h>
 #include <wx/statline.h>
 

pcbnew/dialogs/dialog_gencad_export_options.h

@@ -31,6 +31,7 @@
 
 class PCB_EDIT_FRAME;
 class wxFilePickerCtrl;
+class wxCheckBox;
 
 ///< Settings for GenCAD exporter
 enum GENCAD_EXPORT_OPT

pcbnew/edit_track_width.cpp

@@ -27,6 +27,7 @@
 #include <track.h>
 #include <tools/pcb_actions.h>
 #include <tool/tool_manager.h>
+#include <wx/choice.h>
 
 void PCB_EDIT_FRAME::SetTrackSegmentWidth( TRACK*             aTrackItem,
                                            PICKED_ITEMS_LIST* aItemsListPicker,

pcbnew/files.cpp

@@ -42,6 +42,7 @@
 #include <wildcards_and_files_ext.h>
 #include <tool/tool_manager.h>
 #include <board.h>
+#include <wx/checkbox.h>
 #include <wx/stdpaths.h>
 #include <ratsnest/ratsnest_data.h>
 #include <kiplatform/app.h>

pcbnew/footprint_viewer_frame.cpp

@@ -56,6 +56,7 @@
 #include <tools/pcb_picker_tool.h>
 #include <tools/pcb_selection_tool.h>
 #include <wildcards_and_files_ext.h>
+#include <wx/listbox.h>
 #include <wx/tokenzr.h>
 
 using namespace std::placeholders;

pcbnew/footprint_wizard_frame.cpp

@@ -37,6 +37,7 @@
 #include <pcbnew_id.h>
 #include <pcbnew_settings.h>
 #include "footprint_wizard_frame.h"
+#include <wx/listbox.h>
 #include <wx/tokenzr.h>
 #include <wx/numformatter.h>
 #include <wildcards_and_files_ext.h>

pcbnew/footprint_wizard_frame_functions.cpp

@@ -36,6 +36,7 @@
 #include <dialogs/dialog_footprint_wizard_list.h>
 #include <base_units.h>
 #include <widgets/wx_grid.h>
+#include <wx/listbox.h>
 
 #include <tool/tool_manager.h>
 

pcbnew/toolbars_footprint_viewer.cpp

@@ -31,6 +31,7 @@
 #include "footprint_viewer_frame.h"
 #include "pcbnew_id.h"
 #include <widgets/wx_menubar.h>
+#include <wx/choice.h>
 
 
 void FOOTPRINT_VIEWER_FRAME::ReCreateHToolbar()