From 4ac5404822a787acee3f75b1846e0a7fe608efc3 Mon Sep 17 00:00:00 2001 From: Marek Roszko Date: Mon, 11 Sep 2023 19:09:55 -0400 Subject: [PATCH] Move HTML_WINDOW to widgets folder, also fix some fbps that were wrongly not edited Somebody manually edited at least 3 files fixed here....so the fbps were wrong --- common/CMakeLists.txt | 2 +- .../dialogs/dialog_display_html_text_base.cpp | 4 +- .../dialogs/dialog_display_html_text_base.fbp | 7 +++- .../dialogs/dialog_display_html_text_base.h | 4 +- common/dialogs/dialog_plugin_options_base.fbp | 2 +- common/dialogs/dialog_plugin_options_base.h | 2 +- common/{ => widgets}/html_window.cpp | 2 +- common/widgets/wx_html_report_box.h | 2 +- common/widgets/wx_html_report_panel_base.cpp | 2 +- common/widgets/wx_html_report_panel_base.fbp | 2 +- common/widgets/wx_html_report_panel_base.h | 4 +- eeschema/dialogs/dialog_choose_symbol.h | 2 +- eeschema/dialogs/dialog_rescue_each_base.cpp | 2 +- eeschema/dialogs/dialog_rescue_each_base.fbp | 2 +- eeschema/dialogs/dialog_rescue_each_base.h | 4 +- eeschema/dialogs/dialog_symbol_remap_base.cpp | 2 +- eeschema/dialogs/dialog_symbol_remap_base.fbp | 4 +- eeschema/dialogs/dialog_symbol_remap_base.h | 4 +- include/{ => widgets}/html_window.h | 0 include/widgets/lib_tree.h | 2 +- .../dialogs/dialog_template_selector_base.cpp | 2 +- .../dialogs/dialog_template_selector_base.fbp | 2 +- kicad/dialogs/dialog_template_selector_base.h | 4 +- kicad/pcm/dialogs/panel_packages_view.cpp | 2 +- .../pcm/dialogs/panel_packages_view_base.cpp | 2 +- .../pcm/dialogs/panel_packages_view_base.fbp | 2 +- .../panel_electrical_spacing_iec60664.cpp | 2 +- ...panel_electrical_spacing_iec60664_base.cpp | 6 +-- ...panel_electrical_spacing_iec60664_base.fbp | 2 +- .../panel_electrical_spacing_iec60664_base.h | 2 +- .../panel_eseries_display_base.cpp | 2 +- .../panel_eseries_display_base.fbp | 6 +-- .../panel_eseries_display_base.h | 4 +- .../panel_fusing_current_base.cpp | 2 +- .../panel_fusing_current_base.fbp | 2 +- .../panel_fusing_current_base.h | 4 +- .../panel_galvanic_corrosion_base.cpp | 2 +- .../panel_galvanic_corrosion_base.fbp | 2 +- .../panel_galvanic_corrosion_base.h | 4 +- .../panel_r_calculator_base.cpp | 2 +- .../panel_r_calculator_base.fbp | 38 +------------------ .../panel_r_calculator_base.h | 4 +- .../panel_rf_attenuators_base.cpp | 3 +- .../panel_rf_attenuators_base.fbp | 4 +- .../panel_rf_attenuators_base.h | 5 ++- .../panel_track_width_base.cpp | 2 +- .../panel_track_width_base.fbp | 2 +- .../panel_track_width_base.h | 4 +- 48 files changed, 70 insertions(+), 103 deletions(-) rename common/{ => widgets}/html_window.cpp (98%) rename include/{ => widgets}/html_window.h (100%) diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index d3c6a8ef87..438f7f35d4 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -212,6 +212,7 @@ set( COMMON_WIDGET_SRCS widgets/grid_icon_text_helpers.cpp widgets/grid_text_button_helpers.cpp widgets/grid_text_helpers.cpp + widgets/html_window.cpp widgets/indicator_icon.cpp widgets/wx_infobar.cpp widgets/kistatusbar.cpp @@ -393,7 +394,6 @@ set( COMMON_SRCS grid_tricks.cpp hotkey_store.cpp hotkeys_basic.cpp - html_window.cpp kiface_base.cpp kiid.cpp kiway.cpp diff --git a/common/dialogs/dialog_display_html_text_base.cpp b/common/dialogs/dialog_display_html_text_base.cpp index cc5a6186da..a3e4b2b901 100644 --- a/common/dialogs/dialog_display_html_text_base.cpp +++ b/common/dialogs/dialog_display_html_text_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.0) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -18,7 +18,7 @@ DIALOG_DISPLAY_HTML_TEXT_BASE::DIALOG_DISPLAY_HTML_TEXT_BASE( wxWindow* parent, bMainSizer->SetMinSize( wxSize( 540,240 ) ); m_htmlWindow = new HTML_WINDOW( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO ); - bMainSizer->Add( m_htmlWindow, 1, wxALL|wxEXPAND, 5 ); + bMainSizer->Add( m_htmlWindow, 1, wxALL|wxEXPAND, 10 ); m_sdbSizer1 = new wxStdDialogButtonSizer(); m_sdbSizer1OK = new wxButton( this, wxID_OK ); diff --git a/common/dialogs/dialog_display_html_text_base.fbp b/common/dialogs/dialog_display_html_text_base.fbp index c6247e09e5..4862729643 100644 --- a/common/dialogs/dialog_display_html_text_base.fbp +++ b/common/dialogs/dialog_display_html_text_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -14,6 +14,7 @@ dialog_display_html_text_base 1000 none + 1 dialog_display_html_text_base @@ -25,6 +26,7 @@ 1 1 UI + 0 0 0 @@ -50,6 +52,7 @@ DIALOG_SHIM; dialog_shim.h + 0 @@ -108,7 +111,7 @@ 1 wxHW_SCROLLBAR_AUTO - HTML_WINDOW; html_window.h; + HTML_WINDOW; widgets/html_window.h; 0 diff --git a/common/dialogs/dialog_display_html_text_base.h b/common/dialogs/dialog_display_html_text_base.h index 55a9d8ae50..b084d22e3b 100644 --- a/common/dialogs/dialog_display_html_text_base.h +++ b/common/dialogs/dialog_display_html_text_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.0) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -10,7 +10,7 @@ #include #include #include -#include "html_window.h" +#include "widgets/html_window.h" #include "dialog_shim.h" #include #include diff --git a/common/dialogs/dialog_plugin_options_base.fbp b/common/dialogs/dialog_plugin_options_base.fbp index 95db69a364..08364b4f86 100644 --- a/common/dialogs/dialog_plugin_options_base.fbp +++ b/common/dialogs/dialog_plugin_options_base.fbp @@ -555,7 +555,7 @@ 1 wxHW_SCROLLBAR_AUTO - HTML_WINDOW; html_window.h; + HTML_WINDOW; widgets/html_window.h; 0 diff --git a/common/dialogs/dialog_plugin_options_base.h b/common/dialogs/dialog_plugin_options_base.h index 0d08cc8d91..987f7ff251 100644 --- a/common/dialogs/dialog_plugin_options_base.h +++ b/common/dialogs/dialog_plugin_options_base.h @@ -13,7 +13,7 @@ class STD_BITMAP_BUTTON; class WX_GRID; -#include "html_window.h" +#include "widgets/html_window.h" #include "dialog_shim.h" #include #include diff --git a/common/html_window.cpp b/common/widgets/html_window.cpp similarity index 98% rename from common/html_window.cpp rename to common/widgets/html_window.cpp index 5cdfd25219..afee719349 100644 --- a/common/html_window.cpp +++ b/common/widgets/html_window.cpp @@ -22,7 +22,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#include #include diff --git a/common/widgets/wx_html_report_box.h b/common/widgets/wx_html_report_box.h index bda36a68a2..9b52cedfbe 100644 --- a/common/widgets/wx_html_report_box.h +++ b/common/widgets/wx_html_report_box.h @@ -22,7 +22,7 @@ #include #include -#include +#include #include /** diff --git a/common/widgets/wx_html_report_panel_base.cpp b/common/widgets/wx_html_report_panel_base.cpp index 63b656fec2..f7f76cf9b4 100644 --- a/common/widgets/wx_html_report_panel_base.cpp +++ b/common/widgets/wx_html_report_panel_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/common/widgets/wx_html_report_panel_base.fbp b/common/widgets/wx_html_report_panel_base.fbp index 7d77bb7f9b..b000ab0f95 100644 --- a/common/widgets/wx_html_report_panel_base.fbp +++ b/common/widgets/wx_html_report_panel_base.fbp @@ -126,7 +126,7 @@ 1 wxHW_SCROLLBAR_AUTO - HTML_WINDOW; html_window.h; + HTML_WINDOW; widgets/html_window.h; 0 diff --git a/common/widgets/wx_html_report_panel_base.h b/common/widgets/wx_html_report_panel_base.h index 1f5749a7c4..f34fc75ccc 100644 --- a/common/widgets/wx_html_report_panel_base.h +++ b/common/widgets/wx_html_report_panel_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -10,7 +10,7 @@ #include #include #include -#include "html_window.h" +#include "widgets/html_window.h" #include #include #include diff --git a/eeschema/dialogs/dialog_choose_symbol.h b/eeschema/dialogs/dialog_choose_symbol.h index 6fef667738..03aff6036a 100644 --- a/eeschema/dialogs/dialog_choose_symbol.h +++ b/eeschema/dialogs/dialog_choose_symbol.h @@ -27,7 +27,7 @@ #include "dialog_shim.h" #include #include -#include +#include class wxCheckBox; class wxStaticBitmap; diff --git a/eeschema/dialogs/dialog_rescue_each_base.cpp b/eeschema/dialogs/dialog_rescue_each_base.cpp index 864067e958..241859435f 100644 --- a/eeschema/dialogs/dialog_rescue_each_base.cpp +++ b/eeschema/dialogs/dialog_rescue_each_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/eeschema/dialogs/dialog_rescue_each_base.fbp b/eeschema/dialogs/dialog_rescue_each_base.fbp index ed3dca2546..dcdb1c2533 100644 --- a/eeschema/dialogs/dialog_rescue_each_base.fbp +++ b/eeschema/dialogs/dialog_rescue_each_base.fbp @@ -121,7 +121,7 @@ 1 wxHW_SCROLLBAR_AUTO - HTML_WINDOW; html_window.h; + HTML_WINDOW; widgets/html_window.h; 0 diff --git a/eeschema/dialogs/dialog_rescue_each_base.h b/eeschema/dialogs/dialog_rescue_each_base.h index b086bc83d1..f92e30459b 100644 --- a/eeschema/dialogs/dialog_rescue_each_base.h +++ b/eeschema/dialogs/dialog_rescue_each_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -10,7 +10,7 @@ #include #include #include -#include "html_window.h" +#include "widgets/html_window.h" #include "dialog_shim.h" #include #include diff --git a/eeschema/dialogs/dialog_symbol_remap_base.cpp b/eeschema/dialogs/dialog_symbol_remap_base.cpp index e59224463e..96890604d6 100644 --- a/eeschema/dialogs/dialog_symbol_remap_base.cpp +++ b/eeschema/dialogs/dialog_symbol_remap_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.0) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/eeschema/dialogs/dialog_symbol_remap_base.fbp b/eeschema/dialogs/dialog_symbol_remap_base.fbp index 5ae119eeb4..59de754d15 100644 --- a/eeschema/dialogs/dialog_symbol_remap_base.fbp +++ b/eeschema/dialogs/dialog_symbol_remap_base.fbp @@ -120,7 +120,7 @@ 1 wxHW_SCROLLBAR_AUTO - HTML_WINDOW; html_window.h; + HTML_WINDOW; widgets/html_window.h; 0 @@ -347,7 +347,7 @@ Resizable 1 - WX_HTML_REPORT_PANEL; wx_html_report_panel.h + WX_HTML_REPORT_PANEL; widgets/wx_html_report_panel.h; forward_declare 0 diff --git a/eeschema/dialogs/dialog_symbol_remap_base.h b/eeschema/dialogs/dialog_symbol_remap_base.h index 6ed801cdca..7cc47a8c79 100644 --- a/eeschema/dialogs/dialog_symbol_remap_base.h +++ b/eeschema/dialogs/dialog_symbol_remap_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.0) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -12,7 +12,7 @@ #include class WX_HTML_REPORT_PANEL; -#include "html_window.h" +#include "widgets/html_window.h" #include "dialog_shim.h" #include #include diff --git a/include/html_window.h b/include/widgets/html_window.h similarity index 100% rename from include/html_window.h rename to include/widgets/html_window.h diff --git a/include/widgets/lib_tree.h b/include/widgets/lib_tree.h index 5164d48a09..a991e06eb0 100644 --- a/include/widgets/lib_tree.h +++ b/include/widgets/lib_tree.h @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include class wxTextCtrl; diff --git a/kicad/dialogs/dialog_template_selector_base.cpp b/kicad/dialogs/dialog_template_selector_base.cpp index 197862c701..7011c9d5b0 100644 --- a/kicad/dialogs/dialog_template_selector_base.cpp +++ b/kicad/dialogs/dialog_template_selector_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/kicad/dialogs/dialog_template_selector_base.fbp b/kicad/dialogs/dialog_template_selector_base.fbp index e6659c5708..bc4b7c30ac 100644 --- a/kicad/dialogs/dialog_template_selector_base.fbp +++ b/kicad/dialogs/dialog_template_selector_base.fbp @@ -455,7 +455,7 @@ 1 -1,-1 wxHW_SCROLLBAR_AUTO - HTML_WINDOW; html_window.h; + HTML_WINDOW; widgets/html_window.h; 0 diff --git a/kicad/dialogs/dialog_template_selector_base.h b/kicad/dialogs/dialog_template_selector_base.h index 51cb5488e6..735463772e 100644 --- a/kicad/dialogs/dialog_template_selector_base.h +++ b/kicad/dialogs/dialog_template_selector_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -12,7 +12,7 @@ #include class STD_BITMAP_BUTTON; -#include "html_window.h" +#include "widgets/html_window.h" #include "dialog_shim.h" #include #include diff --git a/kicad/pcm/dialogs/panel_packages_view.cpp b/kicad/pcm/dialogs/panel_packages_view.cpp index 50019cf074..54e7e801e6 100644 --- a/kicad/pcm/dialogs/panel_packages_view.cpp +++ b/kicad/pcm/dialogs/panel_packages_view.cpp @@ -20,7 +20,7 @@ #include "panel_packages_view.h" #include -#include +#include #include #include #include diff --git a/kicad/pcm/dialogs/panel_packages_view_base.cpp b/kicad/pcm/dialogs/panel_packages_view_base.cpp index 74570e032f..0db4e44e8e 100644 --- a/kicad/pcm/dialogs/panel_packages_view_base.cpp +++ b/kicad/pcm/dialogs/panel_packages_view_base.cpp @@ -5,7 +5,7 @@ // PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#include "html_window.h" +#include "widgets/html_window.h" #include "widgets/wx_panel.h" #include "panel_packages_view_base.h" diff --git a/kicad/pcm/dialogs/panel_packages_view_base.fbp b/kicad/pcm/dialogs/panel_packages_view_base.fbp index 189b92148b..2465eedb3a 100644 --- a/kicad/pcm/dialogs/panel_packages_view_base.fbp +++ b/kicad/pcm/dialogs/panel_packages_view_base.fbp @@ -563,7 +563,7 @@ 1 wxHW_SCROLLBAR_NEVER - HTML_WINDOW; html_window.h; forward_declare + HTML_WINDOW; widgets/html_window.h; forward_declare 0 diff --git a/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664.cpp b/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664.cpp index eac5cd0fb1..a39464ac23 100644 --- a/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664.cpp +++ b/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664.cpp @@ -27,7 +27,7 @@ #include #include "iec60664.h" #include -#include +#include #include diff --git a/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664_base.cpp b/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664_base.cpp index 9bddf0c245..fdc721fcf4 100644 --- a/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664_base.cpp +++ b/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664_base.cpp @@ -1,11 +1,11 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#include "html_window.h" +#include "widgets/html_window.h" #include "panel_electrical_spacing_iec60664_base.h" @@ -23,7 +23,7 @@ PANEL_ELECTRICAL_SPACING_IEC60664_BASE::PANEL_ELECTRICAL_SPACING_IEC60664_BASE( m_stTitle = new wxStaticText( m_scrolledWindow, wxID_ANY, _("Insulation for equipment within low-voltage supply systems"), wxDefaultPosition, wxDefaultSize, 0 ); m_stTitle->Wrap( -1 ); - m_stTitle->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); + m_stTitle->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); bSizerMain->Add( m_stTitle, 0, wxALIGN_CENTER|wxALL, 5 ); diff --git a/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664_base.fbp b/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664_base.fbp index 107502e8e4..c004275398 100644 --- a/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664_base.fbp +++ b/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664_base.fbp @@ -2897,7 +2897,7 @@ 1 wxHW_SCROLLBAR_AUTO - HTML_WINDOW; html_window.h; forward_declare + HTML_WINDOW; widgets/html_window.h; forward_declare 0 diff --git a/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664_base.h b/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664_base.h index 2169a84794..0d01318540 100644 --- a/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664_base.h +++ b/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/pcb_calculator/calculator_panels/panel_eseries_display_base.cpp b/pcb_calculator/calculator_panels/panel_eseries_display_base.cpp index dcdf7d6b50..f12b496ab3 100644 --- a/pcb_calculator/calculator_panels/panel_eseries_display_base.cpp +++ b/pcb_calculator/calculator_panels/panel_eseries_display_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-282-g1fa54006) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/pcb_calculator/calculator_panels/panel_eseries_display_base.fbp b/pcb_calculator/calculator_panels/panel_eseries_display_base.fbp index 2877e273c2..9fd713b44f 100644 --- a/pcb_calculator/calculator_panels/panel_eseries_display_base.fbp +++ b/pcb_calculator/calculator_panels/panel_eseries_display_base.fbp @@ -35,7 +35,6 @@ 1 - 0 1 impl_virtual @@ -117,7 +116,6 @@ Dock 0 Left - 0 0 0 0 @@ -220,7 +218,6 @@ Dock 0 Left - 0 0 0 0 @@ -300,7 +297,6 @@ Dock 0 Left - 0 1 1 @@ -326,7 +322,7 @@ 1 wxHW_SCROLLBAR_AUTO - HTML_WINDOW; html_window.h; + HTML_WINDOW; widgets/html_window.h; 0 diff --git a/pcb_calculator/calculator_panels/panel_eseries_display_base.h b/pcb_calculator/calculator_panels/panel_eseries_display_base.h index 3d59825fb1..8aa761beda 100644 --- a/pcb_calculator/calculator_panels/panel_eseries_display_base.h +++ b/pcb_calculator/calculator_panels/panel_eseries_display_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-282-g1fa54006) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -10,7 +10,7 @@ #include #include #include -#include "html_window.h" +#include "widgets/html_window.h" #include "calculator_panels/calculator_panel.h" #include #include diff --git a/pcb_calculator/calculator_panels/panel_fusing_current_base.cpp b/pcb_calculator/calculator_panels/panel_fusing_current_base.cpp index 072d046ca5..636253079f 100644 --- a/pcb_calculator/calculator_panels/panel_fusing_current_base.cpp +++ b/pcb_calculator/calculator_panels/panel_fusing_current_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/pcb_calculator/calculator_panels/panel_fusing_current_base.fbp b/pcb_calculator/calculator_panels/panel_fusing_current_base.fbp index da59b97d7c..f21f320cc2 100644 --- a/pcb_calculator/calculator_panels/panel_fusing_current_base.fbp +++ b/pcb_calculator/calculator_panels/panel_fusing_current_base.fbp @@ -1792,7 +1792,7 @@ 1 wxHW_SCROLLBAR_AUTO - HTML_WINDOW; html_window.h; + HTML_WINDOW; widgets/html_window.h; 0 diff --git a/pcb_calculator/calculator_panels/panel_fusing_current_base.h b/pcb_calculator/calculator_panels/panel_fusing_current_base.h index c6120cb679..d5d87cf164 100644 --- a/pcb_calculator/calculator_panels/panel_fusing_current_base.h +++ b/pcb_calculator/calculator_panels/panel_fusing_current_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -13,7 +13,7 @@ class UNIT_SELECTOR_LEN; class UNIT_SELECTOR_THICKNESS; -#include "html_window.h" +#include "widgets/html_window.h" #include "calculator_panels/calculator_panel.h" #include #include diff --git a/pcb_calculator/calculator_panels/panel_galvanic_corrosion_base.cpp b/pcb_calculator/calculator_panels/panel_galvanic_corrosion_base.cpp index 877b39be27..7608d77f74 100644 --- a/pcb_calculator/calculator_panels/panel_galvanic_corrosion_base.cpp +++ b/pcb_calculator/calculator_panels/panel_galvanic_corrosion_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/pcb_calculator/calculator_panels/panel_galvanic_corrosion_base.fbp b/pcb_calculator/calculator_panels/panel_galvanic_corrosion_base.fbp index 23a7cea482..215f7ff4c9 100644 --- a/pcb_calculator/calculator_panels/panel_galvanic_corrosion_base.fbp +++ b/pcb_calculator/calculator_panels/panel_galvanic_corrosion_base.fbp @@ -260,7 +260,7 @@ 1 wxHW_SCROLLBAR_AUTO - HTML_WINDOW; html_window.h; + HTML_WINDOW; widgets/html_window.h; 0 diff --git a/pcb_calculator/calculator_panels/panel_galvanic_corrosion_base.h b/pcb_calculator/calculator_panels/panel_galvanic_corrosion_base.h index 39efcc902c..4b6e8c32f4 100644 --- a/pcb_calculator/calculator_panels/panel_galvanic_corrosion_base.h +++ b/pcb_calculator/calculator_panels/panel_galvanic_corrosion_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -10,7 +10,7 @@ #include #include #include -#include "html_window.h" +#include "widgets/html_window.h" #include "calculator_panels/calculator_panel.h" #include #include diff --git a/pcb_calculator/calculator_panels/panel_r_calculator_base.cpp b/pcb_calculator/calculator_panels/panel_r_calculator_base.cpp index 9d88f3b215..b195604612 100644 --- a/pcb_calculator/calculator_panels/panel_r_calculator_base.cpp +++ b/pcb_calculator/calculator_panels/panel_r_calculator_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-282-g1fa54006) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/pcb_calculator/calculator_panels/panel_r_calculator_base.fbp b/pcb_calculator/calculator_panels/panel_r_calculator_base.fbp index 2187511e6e..a2665f6646 100644 --- a/pcb_calculator/calculator_panels/panel_r_calculator_base.fbp +++ b/pcb_calculator/calculator_panels/panel_r_calculator_base.fbp @@ -35,7 +35,6 @@ 1 - 0 1 impl_virtual @@ -47,7 +46,7 @@ PANEL_R_CALCULATOR_BASE -1,-1 - CALCULATOR_PANEL; calculator_panels/panel_r_calculator.h; forward_declare + CALCULATOR_PANEL; calculator_panels/calculator_panel.h; forward_declare 0 @@ -120,7 +119,6 @@ Dock 0 Left - 0 1 1 @@ -182,7 +180,6 @@ Dock 0 Left - 0 1 1 @@ -247,7 +244,6 @@ Dock 0 Left - 0 1 1 @@ -309,7 +305,6 @@ Dock 0 Left - 0 1 1 @@ -371,7 +366,6 @@ Dock 0 Left - 0 1 1 @@ -436,7 +430,6 @@ Dock 0 Left - 0 1 1 @@ -498,7 +491,6 @@ Dock 0 Left - 0 1 1 @@ -560,7 +552,6 @@ Dock 0 Left - 0 1 1 @@ -625,7 +616,6 @@ Dock 0 Left - 0 1 1 @@ -689,7 +679,6 @@ Dock 0 Left - 0 1 1 @@ -757,7 +746,6 @@ Dock 0 Left - 0 1 1 @@ -823,7 +811,6 @@ Dock 0 Left - 0 1 1 @@ -889,7 +876,6 @@ Dock 0 Left - 0 1 1 @@ -955,7 +941,6 @@ Dock 0 Left - 0 1 1 @@ -1021,7 +1006,6 @@ Dock 0 Left - 0 1 1 @@ -1119,7 +1103,6 @@ Dock 0 Left - 0 1 1 @@ -1181,7 +1164,6 @@ Dock 0 Left - 0 1 1 @@ -1246,7 +1228,6 @@ Dock 0 Left - 0 1 1 @@ -1308,7 +1289,6 @@ Dock 0 Left - 0 1 1 @@ -1373,7 +1353,6 @@ Dock 0 Left - 0 1 1 @@ -1435,7 +1414,6 @@ Dock 0 Left - 0 1 1 @@ -1497,7 +1475,6 @@ Dock 0 Left - 0 1 1 @@ -1562,7 +1539,6 @@ Dock 0 Left - 0 1 1 @@ -1624,7 +1600,6 @@ Dock 0 Left - 0 1 1 @@ -1689,7 +1664,6 @@ Dock 0 Left - 0 1 1 @@ -1751,7 +1725,6 @@ Dock 0 Left - 0 1 1 @@ -1813,7 +1786,6 @@ Dock 0 Left - 0 1 1 @@ -1878,7 +1850,6 @@ Dock 0 Left - 0 1 1 @@ -1940,7 +1911,6 @@ Dock 0 Left - 0 1 1 @@ -2005,7 +1975,6 @@ Dock 0 Left - 0 1 1 @@ -2069,7 +2038,6 @@ Dock 0 Left - 0 1 1 @@ -2133,7 +2101,6 @@ Dock 0 Left - 0 1 1 @@ -2239,7 +2206,6 @@ Dock 0 Left - 0 1 1 @@ -2265,7 +2231,7 @@ 1 wxHW_SCROLLBAR_AUTO - HTML_WINDOW; html_window.h; + HTML_WINDOW; widgets/html_window.h; 0 diff --git a/pcb_calculator/calculator_panels/panel_r_calculator_base.h b/pcb_calculator/calculator_panels/panel_r_calculator_base.h index c03409bda8..a411899223 100644 --- a/pcb_calculator/calculator_panels/panel_r_calculator_base.h +++ b/pcb_calculator/calculator_panels/panel_r_calculator_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-282-g1fa54006) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -10,7 +10,7 @@ #include #include #include -#include "html_window.h" +#include "widgets/html_window.h" #include "calculator_panels/calculator_panel.h" #include #include diff --git a/pcb_calculator/calculator_panels/panel_rf_attenuators_base.cpp b/pcb_calculator/calculator_panels/panel_rf_attenuators_base.cpp index 8ffb23511b..ab4ccf3e00 100644 --- a/pcb_calculator/calculator_panels/panel_rf_attenuators_base.cpp +++ b/pcb_calculator/calculator_panels/panel_rf_attenuators_base.cpp @@ -1,10 +1,11 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// +#include "widgets/html_window.h" #include "widgets/std_bitmap_button.h" #include "panel_rf_attenuators_base.h" diff --git a/pcb_calculator/calculator_panels/panel_rf_attenuators_base.fbp b/pcb_calculator/calculator_panels/panel_rf_attenuators_base.fbp index d88ebfbf0b..f6ed615af2 100644 --- a/pcb_calculator/calculator_panels/panel_rf_attenuators_base.fbp +++ b/pcb_calculator/calculator_panels/panel_rf_attenuators_base.fbp @@ -1682,7 +1682,7 @@ 1 wxHW_NO_SELECTION|wxHW_SCROLLBAR_AUTO - HTML_WINDOW; html_window.h; + HTML_WINDOW; widgets/html_window.h; 0 @@ -1765,7 +1765,7 @@ 1 wxHW_SCROLLBAR_AUTO - HTML_WINDOW; html_window.h; + HTML_WINDOW; widgets/html_window.h; forward_declare 0 diff --git a/pcb_calculator/calculator_panels/panel_rf_attenuators_base.h b/pcb_calculator/calculator_panels/panel_rf_attenuators_base.h index 8f6c9a3e2a..5e07c42989 100644 --- a/pcb_calculator/calculator_panels/panel_rf_attenuators_base.h +++ b/pcb_calculator/calculator_panels/panel_rf_attenuators_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -10,9 +10,10 @@ #include #include #include +class HTML_WINDOW; class STD_BITMAP_BUTTON; -#include "html_window.h" +#include "widgets/html_window.h" #include "calculator_panel.h" #include #include diff --git a/pcb_calculator/calculator_panels/panel_track_width_base.cpp b/pcb_calculator/calculator_panels/panel_track_width_base.cpp index 620ab40365..9b26ec43c2 100644 --- a/pcb_calculator/calculator_panels/panel_track_width_base.cpp +++ b/pcb_calculator/calculator_panels/panel_track_width_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/pcb_calculator/calculator_panels/panel_track_width_base.fbp b/pcb_calculator/calculator_panels/panel_track_width_base.fbp index 84aed9773d..eaaf71d134 100644 --- a/pcb_calculator/calculator_panels/panel_track_width_base.fbp +++ b/pcb_calculator/calculator_panels/panel_track_width_base.fbp @@ -900,7 +900,7 @@ 1 wxHW_NO_SELECTION|wxHW_SCROLLBAR_AUTO - HTML_WINDOW; html_window.h; + HTML_WINDOW; widgets/html_window.h; 0 diff --git a/pcb_calculator/calculator_panels/panel_track_width_base.h b/pcb_calculator/calculator_panels/panel_track_width_base.h index 0814faf14b..4e7e041f0d 100644 --- a/pcb_calculator/calculator_panels/panel_track_width_base.h +++ b/pcb_calculator/calculator_panels/panel_track_width_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -13,7 +13,7 @@ class UNIT_SELECTOR_LEN; class UNIT_SELECTOR_THICKNESS; -#include "html_window.h" +#include "widgets/html_window.h" #include "calculator_panels/calculator_panel.h" #include #include