Browse Source

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.
6.0.7
jean-pierre charras 5 years ago
parent
commit
f6b4b66a86
  1. 2
      3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.cpp
  2. 3
      common/bitmap.cpp
  3. 1
      common/common.cpp
  4. 1
      common/confirm.cpp
  5. 2
      common/dialog_shim.cpp
  6. 1
      common/dialogs/dialog_configure_paths.cpp
  7. 1
      common/dialogs/dialog_edit_library_tables.cpp
  8. 1
      common/dialogs/dialog_image_editor.cpp
  9. 2
      common/dialogs/dialog_migrate_settings.cpp
  10. 4
      common/dialogs/dialog_text_entry.h
  11. 1
      common/dialogs/panel_setup_severities.cpp
  12. 2
      common/dialogs/panel_setup_severities.h
  13. 5
      common/eda_dde.cpp
  14. 2
      common/fp_lib_table.cpp
  15. 2
      common/gal/opengl/opengl_gal.cpp
  16. 3
      common/msgpanel.cpp
  17. 1
      common/pgm_base.cpp
  18. 3
      common/widgets/grid_text_button_helpers.cpp
  19. 2
      common/widgets/widget_hotkey_list.cpp
  20. 2
      demos/python_scripts_examples/gen_gerber_and_drill_files_board.py
  21. 4
      eeschema/sch_validators.cpp
  22. 1
      eeschema/sim/ngspice.cpp
  23. 2
      gerbview/DCodeSelectionbox.h
  24. 2
      include/class_board_item.h
  25. 3
      include/gal/color4d.h
  26. 2
      include/gr_basic.h
  27. 2
      include/kiway_player.h
  28. 1
      include/msgpanel.h
  29. 2
      include/painter.h
  30. 2
      include/render_settings.h
  31. 3
      include/widgets/ui_common.h
  32. 1
      kicad/dialogs/dialog_template_selector.cpp
  33. 2
      kicad/kicad.cpp
  34. 2
      pcbnew/board_stackup_manager/dialog_dielectric_list_manager.cpp
  35. 2
      pcbnew/dialogs/dialog_imported_layers.cpp
  36. 2
      pcbnew/swig/python_scripting.cpp
  37. 2
      qa/drc_proto/drc_proto_test.cpp
  38. 2
      qa/qa_utils/mock_pgm.cpp
  39. 1
      qa/qa_utils/mocks.cpp

2
3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.cpp

@ -35,6 +35,8 @@
#include <filename_resolver.h>
#include <pcbnew/class_module.h>
#include <wx/filedlg.h>
#include <kiplatform/ui.h>

3
common/bitmap.cpp

@ -29,6 +29,9 @@
#include <wx/menu.h>
#include <wx/menuitem.h>
#include <wx/aui/auibar.h>
#include <wx/dc.h>
#include <wx/dcclient.h>
#include <wx/dcmemory.h>
#include <cstdint>
#include <mutex>

1
common/common.cpp

@ -34,6 +34,7 @@
#include <wx/utils.h>
#include <wx/stdpaths.h>
#include <wx/url.h>
#include <wx/wx.h>
#include <boost/uuid/uuid_generators.hpp>
#include <boost/uuid/uuid_io.hpp>
#include <boost/functional/hash.hpp>

1
common/confirm.cpp

@ -24,6 +24,7 @@
#include <wx/stockitem.h>
#include <wx/richmsgdlg.h>
#include <wx/choicdlg.h>
#include <confirm.h>
#include <bitmaps.h>
#include <html_messagebox.h>

2
common/dialog_shim.cpp

@ -32,6 +32,8 @@
#include <wx/display.h>
#include <wx/evtloop.h>
#include <wx/app.h>
#include <wx/event.h>
#include <wx/grid.h>
#include <algorithm>

1
common/dialogs/dialog_configure_paths.cpp

@ -35,6 +35,7 @@
#include <widgets/grid_text_button_helpers.h>
#include <algorithm>
#include <wx/dirdlg.h>
enum TEXT_VAR_GRID_COLUMNS
{

1
common/dialogs/dialog_edit_library_tables.cpp

@ -18,6 +18,7 @@
*/
#include <wx/statline.h>
#include <wx/button.h>
#include "dialog_edit_library_tables.h"

1
common/dialogs/dialog_image_editor.cpp

@ -22,6 +22,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <wx/dcclient.h>
#include <confirm.h>
#include <bitmap_base.h>

2
common/dialogs/dialog_migrate_settings.cpp

@ -22,6 +22,8 @@
#include <dialogs/dialog_migrate_settings.h>
#include <settings/settings_manager.h>
#include <wx/dirdlg.h>
DIALOG_MIGRATE_SETTINGS::DIALOG_MIGRATE_SETTINGS( SETTINGS_MANAGER* aManager ) :
DIALOG_MIGRATE_SETTINGS_BASE( nullptr ), m_manager( aManager )

4
common/dialogs/dialog_text_entry.h

@ -32,9 +32,7 @@
#define _DIALOG_TEXT_ENTRY_H_
#include <dialog_text_entry_base.h>
class wxTextValidator;
#include <wx/valtext.h>
class WX_TEXT_ENTRY_DIALOG : public WX_TEXT_ENTRY_DIALOG_BASE

1
common/dialogs/panel_setup_severities.cpp

@ -25,6 +25,7 @@
#include <widgets/ui_common.h>
#include <rc_item.h>
#include "panel_setup_severities.h"
#include <wx/radiobut.h>
PANEL_SETUP_SEVERITIES::PANEL_SETUP_SEVERITIES( PAGED_DIALOG* aParent,

2
common/dialogs/panel_setup_severities.h

@ -28,10 +28,10 @@
#include <map>
#include <wx/panel.h>
class PAGED_DIALOG;
class EDA_DRAW_FRAME;
class wxRadioBox;
class wxRadioButton;
class PANEL_SETUP_SEVERITIES : public wxPanel

5
common/eda_dde.cpp

@ -26,12 +26,11 @@
* @file eda_dde.cpp
*/
//#include <fctsys.h>
#include <eda_dde.h>
#include <eda_draw_frame.h>
#include <id.h>
//#include <common.h>
//#include <macros.h>
#include <wx/wx.h>
static const wxString HOSTNAME( wxT( "localhost" ) );

2
common/fp_lib_table.cpp

@ -35,6 +35,8 @@
#include <fp_lib_table.h>
#include <class_module.h>
#include <wx/hash.h>
#define OPT_SEP '|' ///< options separator character
using namespace LIB_TABLE_T;

2
common/gal/opengl/opengl_gal.cpp

@ -44,6 +44,8 @@
#include <bezier_curves.h>
#include <math/util.h> // for KiROUND
#include <wx/frame.h>
#include <macros.h>
#ifdef __WXDEBUG__

3
common/msgpanel.cpp

@ -30,6 +30,9 @@
#include <msgpanel.h>
#include <wx/dcscreen.h>
#include <wx/dcclient.h>
BEGIN_EVENT_TABLE( EDA_MSG_PANEL, wxPanel )
EVT_PAINT( EDA_MSG_PANEL::OnPaint )

1
common/pgm_base.cpp

@ -38,6 +38,7 @@
#include <wx/stdpaths.h>
#include <wx/sysopt.h>
#include <wx/richmsgdlg.h>
#include <wx/filedlg.h>
#include <build_version.h>
#include <config_params.h>

3
common/widgets/grid_text_button_helpers.cpp

@ -22,6 +22,9 @@
*/
#include <wx/combo.h>
#include <wx/filedlg.h>
#include <wx/dirdlg.h>
#include <bitmap_types.h>
#include <bitmaps.h>
#include <kiway.h>

2
common/widgets/widget_hotkey_list.cpp

@ -26,6 +26,8 @@
#include <widgets/widget_hotkey_list.h>
#include <wx/statline.h>
#include <wx/treelist.h>
#include <wx/msgdlg.h>
#include <wx/menu.h>
#include <tool/tool_action.h>
#include <dialog_shim.h>

2
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

4
eeschema/sch_validators.cpp

@ -27,8 +27,10 @@
* @brief Implementation of control validators for schematic dialogs.
*/
#include <sch_connection.h>
#include <wx/combo.h>
#include <wx/msgdlg.h>
#include <sch_connection.h>
#include <sch_validators.h>
#include <project/net_settings.h>
#include <template_fieldnames.h>

1
eeschema/sim/ngspice.cpp

@ -26,6 +26,7 @@
*/
#include <config.h> // Needed for MSW compilation
#include <wx/log.h>
#include "ngspice.h"
#include "spice_reporter.h"

2
gerbview/DCodeSelectionbox.h

@ -27,6 +27,8 @@
#ifndef DCODESELECTIONBOX_H
#define DCODESELECTIONBOX_H
#include <wx/combobox.h>
/* helper class to display a DCode list and select a DCode id.
*/

2
include/class_board_item.h

@ -38,6 +38,8 @@
#include <layers_id_colors_and_visibility.h>
#include <geometry/geometry_utils.h>
#include <wx/msgdlg.h>
class BOARD;
class BOARD_ITEM_CONTAINER;
class SHAPE_POLY_SET;

3
include/gal/color4d.h

@ -31,7 +31,8 @@
#include <nlohmann/json_fwd.hpp>
#ifdef WX_COMPATIBILITY
#include <wx/wx.h>
#include <wx/colour.h>
#include <wx/string.h>
#endif
/**

2
include/gr_basic.h

@ -29,6 +29,8 @@
#include <gal/color4d.h>
#include <vector>
#include <eda_rect.h>
#include <wx/pen.h>
#include <wx/dc.h>
using KIGFX::COLOR4D;

2
include/kiway_player.h

@ -26,6 +26,8 @@
#define KIWAY_PLAYER_H_
#include <wx/frame.h>
#include <wx/cmdline.h>
#include <vector>
#include <kiway_holder.h>
#include <eda_base_frame.h>

1
include/msgpanel.h

@ -35,6 +35,7 @@
#include <gal/color4d.h>
#include <wx/window.h>
#include <wx/panel.h>
#include <vector>

2
include/painter.h

@ -30,6 +30,8 @@
#include <map>
#include <set>
#include <wx/dc.h>
#include <gal/color4d.h>
#include <render_settings.h>
#include <layers_id_colors_and_visibility.h>

2
include/render_settings.h

@ -31,6 +31,8 @@
#include <layers_id_colors_and_visibility.h>
#include <memory>
#include <wx/dc.h>
class COLOR_SETTINGS;
namespace KIGFX

3
include/widgets/ui_common.h

@ -26,8 +26,9 @@
#ifndef UI_COMMON_H
#define UI_COMMON_H
#include <wx/wx.h>
#include <wx/string.h>
class wxWindow;
namespace KIUI
{

1
kicad/dialogs/dialog_template_selector.cpp

@ -25,6 +25,7 @@
#include "dialog_template_selector.h"
#include <wx/dir.h>
#include <wx/dirdlg.h>
#include <wx/settings.h>

2
kicad/kicad.cpp

@ -30,7 +30,7 @@
#include <wx/filename.h>
#include <wx/log.h>
#include <wx/stdpaths.h>
#include <wx/app.h>
#include <filehistory.h>
#include <hotkeys_basic.h>

2
pcbnew/board_stackup_manager/dialog_dielectric_list_manager.cpp

@ -23,7 +23,7 @@
*/
#include "dialog_dielectric_list_manager.h"
#include <wx/msgdlg.h>
DIALOG_DIELECTRIC_MATERIAL::DIALOG_DIELECTRIC_MATERIAL( wxWindow* aParent,
DIELECTRIC_SUBSTRATE_LIST& aMaterialList )

2
pcbnew/dialogs/dialog_imported_layers.cpp

@ -22,6 +22,8 @@
#include <layers_id_colors_and_visibility.h>
#include <dialog_imported_layers.h>
#include <wx/msgdlg.h>
PCB_LAYER_ID DIALOG_IMPORTED_LAYERS::GetSelectedLayerID()
{

2
pcbnew/swig/python_scripting.cpp

@ -39,6 +39,8 @@
#include <pgm_base.h>
#include <settings/settings_manager.h>
#include <wx/app.h>
/* init functions defined by swig */
#if PY_MAJOR_VERSION >= 3

2
qa/drc_proto/drc_proto_test.cpp

@ -27,6 +27,8 @@
#include <profile.h>
#include <wx/cmdline.h>
#include <wx/init.h>
#include <property_mgr.h>
#include <pgm_base.h>

2
qa/qa_utils/mock_pgm.cpp

@ -26,6 +26,8 @@
#include <kiway.h>
#include <kiway_player.h>
#include <wx/app.h>
static struct IFACE : public KIFACE_I
{

1
qa/qa_utils/mocks.cpp

@ -28,6 +28,7 @@
#include <eda_dde.h>
#include <wx/file.h>
#include <wx/snglinst.h>
#include <wx/app.h>
#include <class_board.h>
#include <fp_lib_table.h>
#include <footprint_viewer_frame.h>

Loading…
Cancel
Save