From 6d07e9a754d4fa2d760e320359bf678784d13aa3 Mon Sep 17 00:00:00 2001 From: Maciej Suminski Date: Mon, 15 Jun 2015 15:54:58 +0200 Subject: [PATCH] Fixed dialogs asserts. --- common/dialogs/dialog_page_settings_base.cpp | 8 +- common/dialogs/dialog_page_settings_base.fbp | 6 +- common/dialogs/dialog_page_settings_base.h | 2 +- eeschema/dialogs/dialog_annotate_base.cpp | 7 +- eeschema/dialogs/dialog_annotate_base.fbp | 4 +- eeschema/dialogs/dialog_annotate_base.h | 4 +- eeschema/dialogs/dialog_bom_base.cpp | 10 +- eeschema/dialogs/dialog_bom_base.fbp | 8 +- eeschema/dialogs/dialog_bom_base.h | 2 +- ...dialog_edit_component_in_schematic_fbp.cpp | 10 +- ...dialog_edit_component_in_schematic_fbp.fbp | 8 +- .../dialog_edit_component_in_schematic_fbp.h | 2 +- eeschema/dialogs/dialog_edit_label_base.cpp | 4 +- eeschema/dialogs/dialog_edit_label_base.fbp | 4 +- eeschema/dialogs/dialog_edit_label_base.h | 2 +- ...ialog_edit_libentry_fields_in_lib_base.cpp | 8 +- ...ialog_edit_libentry_fields_in_lib_base.fbp | 8 +- .../dialog_edit_libentry_fields_in_lib_base.h | 2 +- .../dialogs/dialog_eeschema_config_fbp.cpp | 8 +- .../dialogs/dialog_eeschema_config_fbp.fbp | 6 +- eeschema/dialogs/dialog_eeschema_config_fbp.h | 2 +- .../dialogs/dialog_eeschema_options_base.cpp | 30 +- .../dialogs/dialog_eeschema_options_base.fbp | 28 +- .../dialogs/dialog_eeschema_options_base.h | 2 +- eeschema/dialogs/dialog_erc_base.cpp | 18 +- eeschema/dialogs/dialog_erc_base.fbp | 26 +- eeschema/dialogs/dialog_erc_base.h | 2 +- eeschema/dialogs/dialog_lib_edit_pin_base.cpp | 16 +- eeschema/dialogs/dialog_lib_edit_pin_base.fbp | 14 +- eeschema/dialogs/dialog_lib_edit_pin_base.h | 2 +- .../dialogs/dialog_lib_edit_text_base.cpp | 4 +- .../dialogs/dialog_lib_edit_text_base.fbp | 2 +- eeschema/dialogs/dialog_lib_edit_text_base.h | 2 +- eeschema/dialogs/dialog_lib_new_component.fbp | 4 +- .../dialogs/dialog_lib_new_component_base.cpp | 4 +- .../dialogs/dialog_lib_new_component_base.h | 2 +- .../dialog_libedit_dimensions_base.cpp | 19 +- .../dialog_libedit_dimensions_base.fbp | 3200 +++++++++++------ .../dialogs/dialog_libedit_dimensions_base.h | 21 +- .../dialogs/dialog_libedit_options_base.cpp | 18 +- .../dialogs/dialog_libedit_options_base.fbp | 16 +- .../dialogs/dialog_libedit_options_base.h | 2 +- eeschema/dialogs/dialog_netlist.cpp | 2 +- eeschema/dialogs/dialog_netlist_base.cpp | 10 +- eeschema/dialogs/dialog_netlist_base.fbp | 8 +- eeschema/dialogs/dialog_netlist_base.h | 2 +- .../dialogs/dialog_plot_schematic_base.cpp | 8 +- .../dialogs/dialog_plot_schematic_base.fbp | 8 +- .../dialog_print_using_printer_base.cpp | 8 +- .../dialog_print_using_printer_base.fbp | 8 +- .../dialog_sch_edit_sheet_pin_base.fbp | 6 +- eeschema/dialogs/dialog_sch_sheet_props.fbp | 6 +- .../dialogs/dialog_sch_sheet_props_base.cpp | 8 +- .../dialogs/dialog_sch_sheet_props_base.h | 2 +- .../dialogs/dialog_schematic_find_base.cpp | 8 +- .../dialogs/dialog_schematic_find_base.fbp | 10 +- eeschema/dialogs/dialog_schematic_find_base.h | 2 +- .../dialog_print_using_printer_base.cpp | 10 +- .../dialog_print_using_printer_base.fbp | 12 +- .../dialogs/dialog_print_using_printer_base.h | 2 +- .../dialogs/properties_frame_base.cpp | 18 +- .../dialogs/properties_frame_base.fbp | 172 +- .../dialogs/properties_frame_base.h | 2 +- .../dialogs/pcb_calculator_frame_base.cpp | 92 +- .../dialogs/pcb_calculator_frame_base.fbp | 104 +- .../dialogs/pcb_calculator_frame_base.h | 2 +- pcbnew/dialogs/dialog_SVG_print_base.cpp | 4 +- pcbnew/dialogs/dialog_SVG_print_base.fbp | 4 +- pcbnew/dialogs/dialog_design_rules_base.cpp | 22 +- pcbnew/dialogs/dialog_design_rules_base.fbp | 32 +- pcbnew/dialogs/dialog_design_rules_base.h | 2 +- pcbnew/dialogs/dialog_drc_base.cpp | 18 +- pcbnew/dialogs/dialog_drc_base.fbp | 20 +- pcbnew/dialogs/dialog_drc_base.h | 2 +- ...ialog_edit_module_for_BoardEditor_base.cpp | 26 +- ...ialog_edit_module_for_BoardEditor_base.fbp | 66 +- .../dialog_edit_module_for_BoardEditor_base.h | 2 +- .../dialog_edit_module_for_Modedit_base.cpp | 8 +- .../dialog_edit_module_for_Modedit_base.fbp | 6 +- .../dialog_edit_module_for_Modedit_base.h | 2 +- pcbnew/dialogs/dialog_enum_pads_base.cpp | 4 +- pcbnew/dialogs/dialog_enum_pads_base.fbp | 2 +- pcbnew/dialogs/dialog_enum_pads_base.h | 2 +- pcbnew/dialogs/dialog_fp_lib_table_base.fbp | 2 +- pcbnew/dialogs/dialog_fp_lib_table_base.h | 2 +- .../dialogs/dialog_fp_plugin_options_base.cpp | 5 +- .../dialogs/dialog_fp_plugin_options_base.fbp | 2 +- .../dialogs/dialog_fp_plugin_options_base.h | 4 +- .../dialog_freeroute_exchange_base.cpp | 4 +- .../dialog_freeroute_exchange_base.fbp | 2 +- .../dialogs/dialog_freeroute_exchange_base.h | 2 +- .../dialog_gen_module_position_file_base.cpp | 6 +- .../dialog_gen_module_position_file_base.fbp | 4 +- .../dialog_gen_module_position_file_base.h | 2 +- pcbnew/dialogs/dialog_gendrill_base.cpp | 6 +- pcbnew/dialogs/dialog_gendrill_base.fbp | 6 +- pcbnew/dialogs/dialog_gendrill_base.h | 2 +- .../dialogs/dialog_global_deletion_base.cpp | 4 +- .../dialogs/dialog_global_deletion_base.fbp | 4 +- pcbnew/dialogs/dialog_global_deletion_base.h | 2 +- ...log_global_modules_fields_edition_base.cpp | 8 +- ...log_global_modules_fields_edition_base.fbp | 6 +- ...ialog_global_modules_fields_edition_base.h | 2 +- .../dialog_graphic_item_properties_base.cpp | 8 +- .../dialog_graphic_item_properties_base.fbp | 10 +- .../dialog_graphic_item_properties_base.h | 2 +- .../dialog_graphic_items_options_base.cpp | 4 +- .../dialog_graphic_items_options_base.fbp | 2 +- .../dialog_graphic_items_options_base.h | 2 +- .../dialog_keepout_area_properties_base.cpp | 8 +- .../dialog_keepout_area_properties_base.fbp | 10 +- .../dialog_keepout_area_properties_base.h | 2 +- pcbnew/dialogs/dialog_layers_setup_base.cpp | 100 +- pcbnew/dialogs/dialog_layers_setup_base.fbp | 98 +- pcbnew/dialogs/dialog_layers_setup_base.h | 2 +- pcbnew/dialogs/dialog_mask_clearance_base.cpp | 10 +- pcbnew/dialogs/dialog_mask_clearance_base.fbp | 12 +- pcbnew/dialogs/dialog_mask_clearance_base.h | 2 +- .../dialogs/dialog_modedit_options_base.cpp | 8 +- .../dialogs/dialog_modedit_options_base.fbp | 6 +- pcbnew/dialogs/dialog_modedit_options_base.h | 2 +- pcbnew/dialogs/dialog_move_exact.fbp | 6 +- pcbnew/dialogs/dialog_move_exact_base.cpp | 8 +- pcbnew/dialogs/dialog_move_exact_base.h | 2 +- ...ialog_non_copper_zones_properties_base.cpp | 8 +- ...ialog_non_copper_zones_properties_base.fbp | 8 +- .../dialog_non_copper_zones_properties_base.h | 2 +- pcbnew/dialogs/dialog_pad_properties_base.cpp | 56 +- pcbnew/dialogs/dialog_pad_properties_base.fbp | 54 +- pcbnew/dialogs/dialog_pad_properties_base.h | 2 +- pcbnew/dialogs/dialog_plot_base.cpp | 4 +- pcbnew/dialogs/dialog_plot_base.fbp | 4 +- ...dialog_pns_length_tuning_settings_base.cpp | 18 +- ...dialog_pns_length_tuning_settings_base.fbp | 16 +- .../dialog_pns_length_tuning_settings_base.h | 2 +- .../dialogs/dialog_print_for_modedit_base.cpp | 10 +- .../dialogs/dialog_print_for_modedit_base.fbp | 12 +- .../dialogs/dialog_print_for_modedit_base.h | 2 +- .../dialog_print_using_printer_base.cpp | 15 +- .../dialog_print_using_printer_base.fbp | 14 +- .../dialogs/dialog_print_using_printer_base.h | 4 +- pcbnew/dialogs/dialog_set_grid_base.cpp | 10 +- pcbnew/dialogs/dialog_set_grid_base.fbp | 8 +- pcbnew/dialogs/dialog_set_grid_base.h | 2 +- .../dialogs/dialog_target_properties_base.cpp | 10 +- .../dialogs/dialog_target_properties_base.fbp | 10 +- pcbnew/dialogs/dialog_track_via_size_base.cpp | 4 +- pcbnew/dialogs/dialog_track_via_size_base.fbp | 2 +- pcbnew/dialogs/dialog_track_via_size_base.h | 2 +- 149 files changed, 2961 insertions(+), 1976 deletions(-) diff --git a/common/dialogs/dialog_page_settings_base.cpp b/common/dialogs/dialog_page_settings_base.cpp index 5d0a483457..197a2552d6 100644 --- a/common/dialogs/dialog_page_settings_base.cpp +++ b/common/dialogs/dialog_page_settings_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -67,7 +67,7 @@ DIALOG_PAGES_SETTINGS_BASE::DIALOG_PAGES_SETTINGS_BASE( wxWindow* parent, wxWind m_TextUserSizeY->SetMaxLength( 6 ); m_TextUserSizeY->SetToolTip( _("Custom paper height.") ); - bSizercustHeight->Add( m_TextUserSizeY, 0, wxALIGN_TOP|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + bSizercustHeight->Add( m_TextUserSizeY, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); bSizerCustSize->Add( bSizercustHeight, 1, wxEXPAND, 5 ); @@ -83,7 +83,7 @@ DIALOG_PAGES_SETTINGS_BASE::DIALOG_PAGES_SETTINGS_BASE( wxWindow* parent, wxWind m_TextUserSizeX->SetMaxLength( 6 ); m_TextUserSizeX->SetToolTip( _("Custom paper width.") ); - bSizercustWidth->Add( m_TextUserSizeX, 0, wxALIGN_LEFT|wxALIGN_TOP|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + bSizercustWidth->Add( m_TextUserSizeX, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); bSizerCustSize->Add( bSizercustWidth, 1, wxEXPAND, 5 ); @@ -99,7 +99,7 @@ DIALOG_PAGES_SETTINGS_BASE::DIALOG_PAGES_SETTINGS_BASE( wxWindow* parent, wxWind m_PageLayoutExampleBitmap->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); m_PageLayoutExampleBitmap->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); - bleftSizer->Add( m_PageLayoutExampleBitmap, 1, wxALIGN_CENTER|wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); + bleftSizer->Add( m_PageLayoutExampleBitmap, 1, wxALL|wxEXPAND, 5 ); bUpperSizerH->Add( bleftSizer, 0, wxEXPAND, 5 ); diff --git a/common/dialogs/dialog_page_settings_base.fbp b/common/dialogs/dialog_page_settings_base.fbp index e09292e291..a4564263a2 100644 --- a/common/dialogs/dialog_page_settings_base.fbp +++ b/common/dialogs/dialog_page_settings_base.fbp @@ -803,7 +803,7 @@ 5 - wxALIGN_TOP|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 0 1 @@ -988,7 +988,7 @@ 5 - wxALIGN_LEFT|wxALIGN_TOP|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 0 1 @@ -1166,7 +1166,7 @@ 5 - wxALIGN_CENTER|wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND + wxALL|wxEXPAND 1 1 diff --git a/common/dialogs/dialog_page_settings_base.h b/common/dialogs/dialog_page_settings_base.h index eda79e286b..13ccf6fd44 100644 --- a/common/dialogs/dialog_page_settings_base.h +++ b/common/dialogs/dialog_page_settings_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! diff --git a/eeschema/dialogs/dialog_annotate_base.cpp b/eeschema/dialogs/dialog_annotate_base.cpp index 8209403c8c..b9e9d7a972 100644 --- a/eeschema/dialogs/dialog_annotate_base.cpp +++ b/eeschema/dialogs/dialog_annotate_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Mar 13 2015) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -47,7 +47,7 @@ DIALOG_ANNOTATE_BASE::DIALOG_ANNOTATE_BASE( wxWindow* parent, wxWindowID id, con bscopeOptSizer->Add( m_rbResetButLock, 0, wxALL, 3 ); - bupperSizer->Add( bscopeOptSizer, 0, wxEXPAND|wxLEFT|wxALIGN_RIGHT, 25 ); + bupperSizer->Add( bscopeOptSizer, 0, wxEXPAND|wxLEFT, 25 ); m_staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); bupperSizer->Add( m_staticline2, 0, wxEXPAND | wxALL, 5 ); @@ -71,7 +71,7 @@ DIALOG_ANNOTATE_BASE::DIALOG_ANNOTATE_BASE( wxWindow* parent, wxWindowID id, con bSizerXpos->Add( 0, 0, 1, wxEXPAND, 5 ); annotate_down_right_bitmap = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); - bSizerXpos->Add( annotate_down_right_bitmap, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT, 12 ); + bSizerXpos->Add( annotate_down_right_bitmap, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 12 ); b_orderOptSizer->Add( bSizerXpos, 0, wxEXPAND|wxRIGHT, 5 ); @@ -220,6 +220,7 @@ DIALOG_ANNOTATE_BASE::DIALOG_ANNOTATE_BASE( wxWindow* parent, wxWindowID id, con this->SetSizer( bmainSizer ); this->Layout(); + bmainSizer->Fit( this ); // Connect Events m_btnClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ANNOTATE_BASE::OnCancelClick ), NULL, this ); diff --git a/eeschema/dialogs/dialog_annotate_base.fbp b/eeschema/dialogs/dialog_annotate_base.fbp index cfceed14de..560edd85de 100644 --- a/eeschema/dialogs/dialog_annotate_base.fbp +++ b/eeschema/dialogs/dialog_annotate_base.fbp @@ -187,7 +187,7 @@ 25 - wxEXPAND|wxLEFT|wxALIGN_RIGHT + wxEXPAND|wxLEFT 0 @@ -999,7 +999,7 @@ 12 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT + wxALIGN_CENTER_VERTICAL|wxRIGHT 0 1 diff --git a/eeschema/dialogs/dialog_annotate_base.h b/eeschema/dialogs/dialog_annotate_base.h index 3fce47b4ee..7865bf2b2c 100644 --- a/eeschema/dialogs/dialog_annotate_base.h +++ b/eeschema/dialogs/dialog_annotate_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Mar 13 2015) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -85,7 +85,7 @@ class DIALOG_ANNOTATE_BASE : public DIALOG_SHIM public: - DIALOG_ANNOTATE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Annotate Schematic"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 432,550 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DIALOG_ANNOTATE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Annotate Schematic"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_ANNOTATE_BASE(); }; diff --git a/eeschema/dialogs/dialog_bom_base.cpp b/eeschema/dialogs/dialog_bom_base.cpp index 109ddc98c4..a32cc24945 100644 --- a/eeschema/dialogs/dialog_bom_base.cpp +++ b/eeschema/dialogs/dialog_bom_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -57,10 +57,10 @@ DIALOG_BOM_BASE::DIALOG_BOM_BASE( wxWindow* parent, wxWindowID id, const wxStrin m_buttonNetlist = new wxButton( this, ID_CREATE_BOM, _("Generate"), wxDefaultPosition, wxDefaultSize, 0 ); m_buttonNetlist->SetDefault(); - bRightSizer->Add( m_buttonNetlist, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); + bRightSizer->Add( m_buttonNetlist, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 ); - bRightSizer->Add( m_buttonCancel, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); + bRightSizer->Add( m_buttonCancel, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); m_buttonHelp = new wxButton( this, ID_HELP, _("Help"), wxDefaultPosition, wxDefaultSize, 0 ); bRightSizer->Add( m_buttonHelp, 0, wxALL|wxEXPAND, 5 ); @@ -69,10 +69,10 @@ DIALOG_BOM_BASE::DIALOG_BOM_BASE( wxWindow* parent, wxWindowID id, const wxStrin bRightSizer->Add( m_staticline2, 0, wxEXPAND|wxALL, 5 ); m_buttonAddPlugin = new wxButton( this, ID_ADD_PLUGIN, _("Add Plugin"), wxDefaultPosition, wxDefaultSize, 0 ); - bRightSizer->Add( m_buttonAddPlugin, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); + bRightSizer->Add( m_buttonAddPlugin, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); m_buttonDelPlugin = new wxButton( this, ID_REMOVEL_PLUGIN, _("Remove Plugin"), wxDefaultPosition, wxDefaultSize, 0 ); - bRightSizer->Add( m_buttonDelPlugin, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); + bRightSizer->Add( m_buttonDelPlugin, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); m_buttonEdit = new wxButton( this, wxID_ANY, _("Edit Plugin File"), wxDefaultPosition, wxDefaultSize, 0 ); bRightSizer->Add( m_buttonEdit, 0, wxALL|wxEXPAND, 5 ); diff --git a/eeschema/dialogs/dialog_bom_base.fbp b/eeschema/dialogs/dialog_bom_base.fbp index 06230764fe..f00eec7598 100644 --- a/eeschema/dialogs/dialog_bom_base.fbp +++ b/eeschema/dialogs/dialog_bom_base.fbp @@ -469,7 +469,7 @@ none 5 - wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 0 1 @@ -557,7 +557,7 @@ 5 - wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 0 1 @@ -814,7 +814,7 @@ 5 - wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 0 1 @@ -902,7 +902,7 @@ 5 - wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 0 1 diff --git a/eeschema/dialogs/dialog_bom_base.h b/eeschema/dialogs/dialog_bom_base.h index cf47f8fea4..135719991c 100644 --- a/eeschema/dialogs/dialog_bom_base.h +++ b/eeschema/dialogs/dialog_bom_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! diff --git a/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp b/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp index 5635f6f9ee..39085d062c 100644 --- a/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp +++ b/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -108,7 +108,7 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP( optionsSizer->Add( defaultsButton, 0, wxALL|wxEXPAND, 5 ); - upperSizer->Add( optionsSizer, 0, wxALIGN_TOP|wxEXPAND|wxALL, 5 ); + upperSizer->Add( optionsSizer, 0, wxEXPAND|wxALL, 5 ); wxStaticBoxSizer* fieldsSizer; fieldsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Fields") ), wxHORIZONTAL ); @@ -235,7 +235,7 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP( textSizeTextCtrl->SetMaxLength( 0 ); textSizeTextCtrl->SetToolTip( _("The size of the currently selected field's text in the schematic") ); - fgSizerPosSize->Add( textSizeTextCtrl, 0, wxEXPAND|wxBOTTOM|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerPosSize->Add( textSizeTextCtrl, 0, wxEXPAND|wxBOTTOM, 5 ); m_staticTextUnitSize = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextUnitSize->Wrap( -1 ); @@ -249,7 +249,7 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP( posXTextCtrl->SetMaxLength( 0 ); posXTextCtrl->SetToolTip( _("The X coordinate of the text relative to the component") ); - fgSizerPosSize->Add( posXTextCtrl, 0, wxEXPAND|wxTOP|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerPosSize->Add( posXTextCtrl, 0, wxEXPAND|wxTOP, 5 ); m_staticTextUnitPosX = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextUnitPosX->Wrap( -1 ); @@ -263,7 +263,7 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP( posYTextCtrl->SetMaxLength( 0 ); posYTextCtrl->SetToolTip( _("The Y coordinate of the text relative to the component") ); - fgSizerPosSize->Add( posYTextCtrl, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerPosSize->Add( posYTextCtrl, 0, wxEXPAND, 5 ); m_staticTextUnitPosY = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextUnitPosY->Wrap( -1 ); diff --git a/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.fbp b/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.fbp index 69bc7bbed7..b02700a13e 100644 --- a/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.fbp +++ b/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.fbp @@ -104,7 +104,7 @@ none 5 - wxALIGN_TOP|wxEXPAND|wxALL + wxEXPAND|wxALL 0 wxID_ANY @@ -2801,7 +2801,7 @@ 5 - wxEXPAND|wxBOTTOM|wxALIGN_CENTER_VERTICAL + wxEXPAND|wxBOTTOM 0 1 @@ -3058,7 +3058,7 @@ 5 - wxEXPAND|wxTOP|wxALIGN_CENTER_VERTICAL + wxEXPAND|wxTOP 0 1 @@ -3315,7 +3315,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL + wxEXPAND 0 1 diff --git a/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.h b/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.h index 2cb3ee39d5..8851c23e98 100644 --- a/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.h +++ b/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! diff --git a/eeschema/dialogs/dialog_edit_label_base.cpp b/eeschema/dialogs/dialog_edit_label_base.cpp index 545bf09211..4fa1dce966 100644 --- a/eeschema/dialogs/dialog_edit_label_base.cpp +++ b/eeschema/dialogs/dialog_edit_label_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 6 2013) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -52,7 +52,7 @@ DIALOG_LABEL_EDITOR_BASE::DIALOG_LABEL_EDITOR_BASE( wxWindow* parent, wxWindowID bSizeCtrlSizer = new wxBoxSizer( wxHORIZONTAL ); m_TextSize = new wxTextCtrl( this, wxID_SIZE, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - bSizeCtrlSizer->Add( m_TextSize, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT, 3 ); + bSizeCtrlSizer->Add( m_TextSize, 0, wxEXPAND|wxLEFT|wxRIGHT, 3 ); m_staticSizeUnits = new wxStaticText( this, wxID_ANY, _("units"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticSizeUnits->Wrap( -1 ); diff --git a/eeschema/dialogs/dialog_edit_label_base.fbp b/eeschema/dialogs/dialog_edit_label_base.fbp index 8874a2f0cf..8bdf512a1d 100644 --- a/eeschema/dialogs/dialog_edit_label_base.fbp +++ b/eeschema/dialogs/dialog_edit_label_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -479,7 +479,7 @@ none 3 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT + wxEXPAND|wxLEFT|wxRIGHT 0 1 diff --git a/eeschema/dialogs/dialog_edit_label_base.h b/eeschema/dialogs/dialog_edit_label_base.h index 7f92c37c39..797c7e97a1 100644 --- a/eeschema/dialogs/dialog_edit_label_base.h +++ b/eeschema/dialogs/dialog_edit_label_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 6 2013) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! diff --git a/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp b/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp index c12779d419..b879d0fc09 100644 --- a/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp +++ b/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 6 2013) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -143,7 +143,7 @@ DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE textSizeTextCtrl->SetMaxLength( 0 ); textSizeTextCtrl->SetToolTip( _("The vertical height of the currently selected field's text in the schematic") ); - fgSizerPosSize->Add( textSizeTextCtrl, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 ); + fgSizerPosSize->Add( textSizeTextCtrl, 0, wxEXPAND|wxBOTTOM, 5 ); m_staticTextUnitSize = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextUnitSize->Wrap( -1 ); @@ -155,7 +155,7 @@ DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE posXTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); posXTextCtrl->SetMaxLength( 0 ); - fgSizerPosSize->Add( posXTextCtrl, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP, 5 ); + fgSizerPosSize->Add( posXTextCtrl, 0, wxEXPAND|wxTOP, 5 ); m_staticTextUnitPosX = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextUnitPosX->Wrap( -1 ); @@ -169,7 +169,7 @@ DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE posYTextCtrl->SetMaxLength( 0 ); posYTextCtrl->SetToolTip( _("The Y coordinate of the text relative to the component") ); - fgSizerPosSize->Add( posYTextCtrl, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerPosSize->Add( posYTextCtrl, 0, wxEXPAND, 5 ); m_staticTextUnitPosY = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextUnitPosY->Wrap( -1 ); diff --git a/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.fbp b/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.fbp index b561e6b9b6..4eb010eb50 100644 --- a/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.fbp +++ b/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.fbp @@ -1,6 +1,6 @@ - + ; C++ @@ -1521,7 +1521,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM + wxEXPAND|wxBOTTOM 0 1 @@ -1778,7 +1778,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP + wxEXPAND|wxTOP 0 1 @@ -2035,7 +2035,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL + wxEXPAND 0 1 diff --git a/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.h b/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.h index bba59ef640..84ec070cbb 100644 --- a/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.h +++ b/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 6 2013) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! diff --git a/eeschema/dialogs/dialog_eeschema_config_fbp.cpp b/eeschema/dialogs/dialog_eeschema_config_fbp.cpp index 636b554f20..e18335b80a 100644 --- a/eeschema/dialogs/dialog_eeschema_config_fbp.cpp +++ b/eeschema/dialogs/dialog_eeschema_config_fbp.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Mar 13 2015) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -38,17 +38,17 @@ DIALOG_EESCHEMA_CONFIG_FBP::DIALOG_EESCHEMA_CONFIG_FBP( wxWindow* parent, wxWind m_buttonAddLib = new wxButton( this, ID_ADD_LIB, _("Add"), wxDefaultPosition, wxDefaultSize, 0 ); m_buttonAddLib->SetToolTip( _("Add a new library after the selected library, and load it") ); - bRightSizer->Add( m_buttonAddLib, 0, wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxRIGHT|wxTOP|wxEXPAND, 5 ); + bRightSizer->Add( m_buttonAddLib, 0, wxLEFT|wxRIGHT|wxTOP|wxEXPAND, 5 ); m_buttonIns = new wxButton( this, wxID_ANY, _("Insert"), wxDefaultPosition, wxDefaultSize, 0 ); m_buttonIns->SetToolTip( _("Add a new library before the selected library, and load it") ); - bRightSizer->Add( m_buttonIns, 0, wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxRIGHT|wxTOP|wxEXPAND, 5 ); + bRightSizer->Add( m_buttonIns, 0, wxLEFT|wxRIGHT|wxTOP|wxEXPAND, 5 ); m_buttonRemoveLib = new wxButton( this, ID_REMOVE_LIB, _("Remove"), wxDefaultPosition, wxDefaultSize, 0 ); m_buttonRemoveLib->SetToolTip( _("Unload the selected library") ); - bRightSizer->Add( m_buttonRemoveLib, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); + bRightSizer->Add( m_buttonRemoveLib, 0, wxALL|wxEXPAND, 5 ); m_buttonUp = new wxButton( this, wxID_ANY, _("Up"), wxDefaultPosition, wxDefaultSize, 0 ); bRightSizer->Add( m_buttonUp, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); diff --git a/eeschema/dialogs/dialog_eeschema_config_fbp.fbp b/eeschema/dialogs/dialog_eeschema_config_fbp.fbp index 760a489b14..afa0bddf28 100644 --- a/eeschema/dialogs/dialog_eeschema_config_fbp.fbp +++ b/eeschema/dialogs/dialog_eeschema_config_fbp.fbp @@ -293,7 +293,7 @@ none 5 - wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxRIGHT|wxTOP|wxEXPAND + wxLEFT|wxRIGHT|wxTOP|wxEXPAND 0 1 @@ -381,7 +381,7 @@ 5 - wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxRIGHT|wxTOP|wxEXPAND + wxLEFT|wxRIGHT|wxTOP|wxEXPAND 0 1 @@ -469,7 +469,7 @@ 5 - wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND + wxALL|wxEXPAND 0 1 diff --git a/eeschema/dialogs/dialog_eeschema_config_fbp.h b/eeschema/dialogs/dialog_eeschema_config_fbp.h index 31f46390ee..73412cfc70 100644 --- a/eeschema/dialogs/dialog_eeschema_config_fbp.h +++ b/eeschema/dialogs/dialog_eeschema_config_fbp.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Mar 13 2015) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! diff --git a/eeschema/dialogs/dialog_eeschema_options_base.cpp b/eeschema/dialogs/dialog_eeschema_options_base.cpp index cd4356e01b..a9a5d06ee2 100644 --- a/eeschema/dialogs/dialog_eeschema_options_base.cpp +++ b/eeschema/dialogs/dialog_eeschema_options_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -57,10 +57,10 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx wxArrayString m_choiceUnitsChoices; m_choiceUnits = new wxChoice( m_panel1, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnitsChoices, 0 ); m_choiceUnits->SetSelection( 0 ); - fgSizer1->Add( m_choiceUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); + fgSizer1->Add( m_choiceUnits, 0, wxALL|wxEXPAND, 3 ); - fgSizer1->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 3 ); + fgSizer1->Add( 0, 0, 1, wxEXPAND, 3 ); m_staticText3 = new wxStaticText( m_panel1, wxID_ANY, _("&Grid size:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText3->Wrap( -1 ); @@ -69,7 +69,7 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx wxArrayString m_choiceGridSizeChoices; m_choiceGridSize = new wxChoice( m_panel1, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceGridSizeChoices, 0 ); m_choiceGridSize->SetSelection( 0 ); - fgSizer1->Add( m_choiceGridSize, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALL, 3 ); + fgSizer1->Add( m_choiceGridSize, 0, wxEXPAND|wxALL, 3 ); m_staticGridUnits = new wxStaticText( m_panel1, wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticGridUnits->Wrap( -1 ); @@ -80,7 +80,7 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx fgSizer1->Add( m_staticText51, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 3 ); m_spinBusWidth = new wxSpinCtrl( m_panel1, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_WRAP, 1, 100, 1 ); - fgSizer1->Add( m_spinBusWidth, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); + fgSizer1->Add( m_spinBusWidth, 0, wxALL|wxEXPAND, 3 ); m_staticBusWidthUnits = new wxStaticText( m_panel1, wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticBusWidthUnits->Wrap( -1 ); @@ -91,7 +91,7 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx fgSizer1->Add( m_staticText5, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 3 ); m_spinLineWidth = new wxSpinCtrl( m_panel1, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_WRAP, 1, 100, 1 ); - fgSizer1->Add( m_spinLineWidth, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); + fgSizer1->Add( m_spinLineWidth, 0, wxALL|wxEXPAND, 3 ); m_staticLineWidthUnits = new wxStaticText( m_panel1, wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticLineWidthUnits->Wrap( -1 ); @@ -102,7 +102,7 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx fgSizer1->Add( m_staticText7, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 3 ); m_spinTextSize = new wxSpinCtrl( m_panel1, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_WRAP, 0, 1000, 0 ); - fgSizer1->Add( m_spinTextSize, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); + fgSizer1->Add( m_spinTextSize, 0, wxALL|wxEXPAND, 3 ); m_staticTextSizeUnits = new wxStaticText( m_panel1, wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextSizeUnits->Wrap( -1 ); @@ -113,7 +113,7 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx fgSizer1->Add( m_staticText9, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 3 ); m_spinRepeatHorizontal = new wxSpinCtrl( m_panel1, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_WRAP, -5000, 5000, 0 ); - fgSizer1->Add( m_spinRepeatHorizontal, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); + fgSizer1->Add( m_spinRepeatHorizontal, 0, wxALL|wxEXPAND, 3 ); m_staticRepeatXUnits = new wxStaticText( m_panel1, wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticRepeatXUnits->Wrap( -1 ); @@ -124,7 +124,7 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx fgSizer1->Add( m_staticText12, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 3 ); m_spinRepeatVertical = new wxSpinCtrl( m_panel1, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_WRAP, -5000, 5000, 100 ); - fgSizer1->Add( m_spinRepeatVertical, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); + fgSizer1->Add( m_spinRepeatVertical, 0, wxALL|wxEXPAND, 3 ); m_staticRepeatYUnits = new wxStaticText( m_panel1, wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticRepeatYUnits->Wrap( -1 ); @@ -135,17 +135,17 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx fgSizer1->Add( m_staticText16, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 3 ); m_spinRepeatLabel = new wxSpinCtrl( m_panel1, wxID_ANY, wxT("1"), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_WRAP, -10, 10, 1 ); - fgSizer1->Add( m_spinRepeatLabel, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); + fgSizer1->Add( m_spinRepeatLabel, 0, wxALL|wxEXPAND, 3 ); - fgSizer1->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 3 ); + fgSizer1->Add( 0, 0, 1, wxEXPAND, 3 ); m_staticText221 = new wxStaticText( m_panel1, wxID_ANY, _("Auto save &time interval:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText221->Wrap( -1 ); fgSizer1->Add( m_staticText221, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 3 ); m_spinAutoSaveInterval = new wxSpinCtrl( m_panel1, ID_M_SPINAUTOSAVEINTERVAL, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 1000, 10 ); - fgSizer1->Add( m_spinAutoSaveInterval, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); + fgSizer1->Add( m_spinAutoSaveInterval, 0, wxALL|wxEXPAND, 3 ); m_staticText23 = new wxStaticText( m_panel1, wxID_ANY, _("minutes"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText23->Wrap( -1 ); @@ -165,7 +165,7 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx fgSizer1->Add( 0, 0, 1, wxEXPAND, 5 ); - bSizer3->Add( fgSizer1, 0, wxALIGN_CENTER|wxEXPAND, 0 ); + bSizer3->Add( fgSizer1, 0, wxEXPAND, 0 ); wxBoxSizer* bSizer2; bSizer2 = new wxBoxSizer( wxVERTICAL ); @@ -223,7 +223,7 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx templateFieldListCtrl = new wxListView( m_panel2, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_HRULES|wxLC_REPORT|wxLC_SINGLE_SEL|wxLC_VRULES ); templateFieldListCtrl->SetMinSize( wxSize( 500,-1 ) ); - bSizer6->Add( templateFieldListCtrl, 1, wxALIGN_TOP|wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 8 ); + bSizer6->Add( templateFieldListCtrl, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 8 ); wxStaticBoxSizer* fieldSizer; fieldSizer = new wxStaticBoxSizer( new wxStaticBox( m_panel2, wxID_ANY, _("Field Settings") ), wxVERTICAL ); @@ -269,7 +269,7 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx m_sdbSizer->AddButton( m_sdbSizerCancel ); m_sdbSizer->Realize(); - bOptionsSizer->Add( m_sdbSizer, 0, wxALIGN_BOTTOM|wxALL|wxEXPAND, 6 ); + bOptionsSizer->Add( m_sdbSizer, 0, wxALL|wxEXPAND, 6 ); mainSizer->Add( bOptionsSizer, 1, wxEXPAND, 12 ); diff --git a/eeschema/dialogs/dialog_eeschema_options_base.fbp b/eeschema/dialogs/dialog_eeschema_options_base.fbp index ecbf7736a2..a7b2188cc4 100644 --- a/eeschema/dialogs/dialog_eeschema_options_base.fbp +++ b/eeschema/dialogs/dialog_eeschema_options_base.fbp @@ -278,7 +278,7 @@ none 0 - wxALIGN_CENTER|wxEXPAND + wxEXPAND 0 3 @@ -377,7 +377,7 @@ 3 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -465,7 +465,7 @@ 3 - wxALIGN_CENTER_VERTICAL|wxEXPAND + wxEXPAND 1 0 @@ -558,7 +558,7 @@ 3 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALL + wxEXPAND|wxALL 0 1 @@ -812,7 +812,7 @@ 3 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -1066,7 +1066,7 @@ 3 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -1320,7 +1320,7 @@ 3 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -1574,7 +1574,7 @@ 3 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -1828,7 +1828,7 @@ 3 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -2082,7 +2082,7 @@ 3 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -2170,7 +2170,7 @@ 3 - wxALIGN_CENTER_VERTICAL|wxEXPAND + wxEXPAND 1 0 @@ -2263,7 +2263,7 @@ 3 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -3501,7 +3501,7 @@ none 8 - wxALIGN_TOP|wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT|wxTOP + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT|wxTOP 1 1 @@ -4237,7 +4237,7 @@ 6 - wxALIGN_BOTTOM|wxALL|wxEXPAND + wxALL|wxEXPAND 0 0 diff --git a/eeschema/dialogs/dialog_eeschema_options_base.h b/eeschema/dialogs/dialog_eeschema_options_base.h index 6ed9c66837..a1f3e3b353 100644 --- a/eeschema/dialogs/dialog_eeschema_options_base.h +++ b/eeschema/dialogs/dialog_eeschema_options_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! diff --git a/eeschema/dialogs/dialog_erc_base.cpp b/eeschema/dialogs/dialog_erc_base.cpp index 3f62099ffa..f194b33fd5 100644 --- a/eeschema/dialogs/dialog_erc_base.cpp +++ b/eeschema/dialogs/dialog_erc_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 6 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -42,35 +42,35 @@ DIALOG_ERC_BASE::DIALOG_ERC_BASE( wxWindow* parent, wxWindowID id, const wxStrin wxGridSizer* gSizeDiag; gSizeDiag = new wxGridSizer( 3, 2, 0, 0 ); - m_ErcTotalErrorsText = new wxStaticText( m_PanelERC, wxID_ANY, _("Total:"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT ); + m_ErcTotalErrorsText = new wxStaticText( m_PanelERC, wxID_ANY, _("Total:"), wxDefaultPosition, wxDefaultSize, 0 ); m_ErcTotalErrorsText->Wrap( -1 ); - gSizeDiag->Add( m_ErcTotalErrorsText, 0, wxALIGN_CENTER_VERTICAL, 5 ); + gSizeDiag->Add( m_ErcTotalErrorsText, 1, wxALIGN_CENTER_VERTICAL, 5 ); m_TotalErrCount = new wxTextCtrl( m_PanelERC, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY ); gSizeDiag->Add( m_TotalErrCount, 0, wxALIGN_CENTER_VERTICAL, 5 ); - m_WarnErcErrorsText = new wxStaticText( m_PanelERC, wxID_ANY, _("Warnings:"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT ); + m_WarnErcErrorsText = new wxStaticText( m_PanelERC, wxID_ANY, _("Warnings:"), wxDefaultPosition, wxDefaultSize, 0 ); m_WarnErcErrorsText->Wrap( -1 ); - gSizeDiag->Add( m_WarnErcErrorsText, 0, wxALIGN_CENTER_VERTICAL, 5 ); + gSizeDiag->Add( m_WarnErcErrorsText, 1, wxALIGN_CENTER_VERTICAL, 5 ); m_LastWarningCount = new wxTextCtrl( m_PanelERC, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY ); gSizeDiag->Add( m_LastWarningCount, 0, wxALIGN_CENTER_VERTICAL, 5 ); - m_LastErrCountText = new wxStaticText( m_PanelERC, wxID_ANY, _("Errors:"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT ); + m_LastErrCountText = new wxStaticText( m_PanelERC, wxID_ANY, _("Errors:"), wxDefaultPosition, wxDefaultSize, 0 ); m_LastErrCountText->Wrap( -1 ); - gSizeDiag->Add( m_LastErrCountText, 0, wxALIGN_CENTER_VERTICAL, 5 ); + gSizeDiag->Add( m_LastErrCountText, 1, wxALIGN_CENTER_VERTICAL, 5 ); m_LastErrCount = new wxTextCtrl( m_PanelERC, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY ); gSizeDiag->Add( m_LastErrCount, 0, wxALIGN_CENTER_VERTICAL, 5 ); - sdiagSizer->Add( gSizeDiag, 0, 0, 5 ); + sdiagSizer->Add( gSizeDiag, 0, wxEXPAND, 5 ); m_WriteResultOpt = new wxCheckBox( m_PanelERC, wxID_ANY, _("Create ERC file report"), wxDefaultPosition, wxDefaultSize, 0 ); sdiagSizer->Add( m_WriteResultOpt, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 ); - bupperSizer->Add( sdiagSizer, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP, 5 ); + bupperSizer->Add( sdiagSizer, 0, wxEXPAND|wxTOP, 5 ); wxBoxSizer* bSizerMessages; bSizerMessages = new wxBoxSizer( wxVERTICAL ); diff --git a/eeschema/dialogs/dialog_erc_base.fbp b/eeschema/dialogs/dialog_erc_base.fbp index b5ed65fbe8..30f2a82c12 100644 --- a/eeschema/dialogs/dialog_erc_base.fbp +++ b/eeschema/dialogs/dialog_erc_base.fbp @@ -262,16 +262,16 @@ 5 wxALL|wxEXPAND 0 - + bupperSizer wxHORIZONTAL none - + 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP + wxEXPAND|wxTOP 0 - + wxID_ANY ERC Report: @@ -279,11 +279,11 @@ wxVERTICAL none - + 5 - + wxEXPAND 0 - + 2 0 @@ -294,7 +294,7 @@ 5 wxALIGN_CENTER_VERTICAL - 0 + 1 1 1 @@ -341,7 +341,7 @@ Resizable 1 - wxALIGN_RIGHT + 0 @@ -468,7 +468,7 @@ 5 wxALIGN_CENTER_VERTICAL - 0 + 1 1 1 @@ -515,7 +515,7 @@ Resizable 1 - wxALIGN_RIGHT + 0 @@ -642,7 +642,7 @@ 5 wxALIGN_CENTER_VERTICAL - 0 + 1 1 1 @@ -689,7 +689,7 @@ Resizable 1 - wxALIGN_RIGHT + 0 diff --git a/eeschema/dialogs/dialog_erc_base.h b/eeschema/dialogs/dialog_erc_base.h index 83689250f0..65ad08393b 100644 --- a/eeschema/dialogs/dialog_erc_base.h +++ b/eeschema/dialogs/dialog_erc_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 6 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! diff --git a/eeschema/dialogs/dialog_lib_edit_pin_base.cpp b/eeschema/dialogs/dialog_lib_edit_pin_base.cpp index 48b41f89c4..af8a07829f 100644 --- a/eeschema/dialogs/dialog_lib_edit_pin_base.cpp +++ b/eeschema/dialogs/dialog_lib_edit_pin_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -36,7 +36,7 @@ DIALOG_LIB_EDIT_PIN_BASE::DIALOG_LIB_EDIT_PIN_BASE( wxWindow* parent, wxWindowID m_textPinName = new wxTextCtrl( this, ID_M_TEXTPINNAME, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_textPinName->SetMaxLength( 0 ); - fgSizerPins->Add( m_textPinName, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxBOTTOM, 3 ); + fgSizerPins->Add( m_textPinName, 0, wxEXPAND|wxTOP|wxBOTTOM, 3 ); m_staticTextPadName = new wxStaticText( this, ID_M_STATICTEXTPADNAME, _("Pin n&umber:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextPadName->Wrap( -1 ); @@ -46,7 +46,7 @@ DIALOG_LIB_EDIT_PIN_BASE::DIALOG_LIB_EDIT_PIN_BASE( wxWindow* parent, wxWindowID m_textPadName = new wxTextCtrl( this, ID_M_TEXTPADNAME, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_textPadName->SetMaxLength( 0 ); - fgSizerPins->Add( m_textPadName, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxBOTTOM, 3 ); + fgSizerPins->Add( m_textPadName, 0, wxEXPAND|wxTOP|wxBOTTOM, 3 ); m_staticTextOrient = new wxStaticText( this, wxID_ANY, _("&Orientation:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextOrient->Wrap( -1 ); @@ -81,10 +81,10 @@ DIALOG_LIB_EDIT_PIN_BASE::DIALOG_LIB_EDIT_PIN_BASE( wxWindow* parent, wxWindowID sbSizerPinSharing = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Sharing") ), wxVERTICAL ); m_checkApplyToAllParts = new wxCheckBox( this, wxID_ANY, _("Common to all &units in component"), wxDefaultPosition, wxDefaultSize, 0 ); - sbSizerPinSharing->Add( m_checkApplyToAllParts, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); + sbSizerPinSharing->Add( m_checkApplyToAllParts, 0, wxALL, 3 ); m_checkApplyToAllConversions = new wxCheckBox( this, wxID_ANY, _("Common to all body &styles (DeMorgan)"), wxDefaultPosition, wxDefaultSize, 0 ); - sbSizerPinSharing->Add( m_checkApplyToAllConversions, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); + sbSizerPinSharing->Add( m_checkApplyToAllConversions, 0, wxALL, 3 ); boarderSizer->Add( sbSizerPinSharing, 0, wxEXPAND|wxALL, 5 ); @@ -94,7 +94,7 @@ DIALOG_LIB_EDIT_PIN_BASE::DIALOG_LIB_EDIT_PIN_BASE( wxWindow* parent, wxWindowID m_checkShow = new wxCheckBox( this, wxID_ANY, _("&Visible"), wxDefaultPosition, wxDefaultSize, 0 ); m_checkShow->SetValue(true); - sbSizerSchematicProperties->Add( m_checkShow, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); + sbSizerSchematicProperties->Add( m_checkShow, 0, wxALL, 3 ); boarderSizer->Add( sbSizerSchematicProperties, 0, wxEXPAND|wxALL, 5 ); @@ -120,7 +120,7 @@ DIALOG_LIB_EDIT_PIN_BASE::DIALOG_LIB_EDIT_PIN_BASE( wxWindow* parent, wxWindowID m_textPinNameTextSize = new wxTextCtrl( this, ID_M_TEXTPINNAMETEXTSIZE, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_textPinNameTextSize->SetMaxLength( 0 ); - fgSizerTextsSizes->Add( m_textPinNameTextSize, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxBOTTOM, 3 ); + fgSizerTextsSizes->Add( m_textPinNameTextSize, 1, wxEXPAND|wxTOP|wxBOTTOM, 3 ); m_staticNameTextSizeUnits = new wxStaticText( this, ID_M_STATICNAMETEXTSIZEUNITS, _("units"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticNameTextSizeUnits->Wrap( -1 ); @@ -132,7 +132,7 @@ DIALOG_LIB_EDIT_PIN_BASE::DIALOG_LIB_EDIT_PIN_BASE( wxWindow* parent, wxWindowID m_textPadNameTextSize = new wxTextCtrl( this, ID_M_TEXTPADNAMETEXTSIZE, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_textPadNameTextSize->SetMaxLength( 0 ); - fgSizerTextsSizes->Add( m_textPadNameTextSize, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxEXPAND, 3 ); + fgSizerTextsSizes->Add( m_textPadNameTextSize, 0, wxTOP|wxBOTTOM|wxEXPAND, 3 ); m_staticNumberTextSizeUnits = new wxStaticText( this, ID_M_STATICNUMBERTEXTSIZEUNITS, _("units"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticNumberTextSizeUnits->Wrap( -1 ); diff --git a/eeschema/dialogs/dialog_lib_edit_pin_base.fbp b/eeschema/dialogs/dialog_lib_edit_pin_base.fbp index f18240fffc..4df7c49e55 100644 --- a/eeschema/dialogs/dialog_lib_edit_pin_base.fbp +++ b/eeschema/dialogs/dialog_lib_edit_pin_base.fbp @@ -212,7 +212,7 @@ 3 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxBOTTOM + wxEXPAND|wxTOP|wxBOTTOM 0 1 @@ -386,7 +386,7 @@ 3 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxBOTTOM + wxEXPAND|wxTOP|wxBOTTOM 0 1 @@ -1022,7 +1022,7 @@ 3 - wxALIGN_CENTER_VERTICAL|wxALL + wxALL 0 1 @@ -1110,7 +1110,7 @@ 3 - wxALIGN_CENTER_VERTICAL|wxALL + wxALL 0 1 @@ -1212,7 +1212,7 @@ 3 - wxALIGN_CENTER_VERTICAL|wxALL + wxALL 0 1 @@ -1414,7 +1414,7 @@ 3 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxBOTTOM + wxEXPAND|wxTOP|wxBOTTOM 1 1 @@ -1671,7 +1671,7 @@ 3 - wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxEXPAND + wxTOP|wxBOTTOM|wxEXPAND 0 1 diff --git a/eeschema/dialogs/dialog_lib_edit_pin_base.h b/eeschema/dialogs/dialog_lib_edit_pin_base.h index d41b330e39..80d85efa92 100644 --- a/eeschema/dialogs/dialog_lib_edit_pin_base.h +++ b/eeschema/dialogs/dialog_lib_edit_pin_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! diff --git a/eeschema/dialogs/dialog_lib_edit_text_base.cpp b/eeschema/dialogs/dialog_lib_edit_text_base.cpp index 3a3f4ca441..cb00637b62 100644 --- a/eeschema/dialogs/dialog_lib_edit_text_base.cpp +++ b/eeschema/dialogs/dialog_lib_edit_text_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -113,7 +113,7 @@ DIALOG_LIB_EDIT_TEXT_BASE::DIALOG_LIB_EDIT_TEXT_BASE( wxWindow* parent, wxWindow bBottomtBoxSizer->Add( m_TextVJustificationOpt, 1, wxALL|wxEXPAND, 5 ); - bPropertiesSizer->Add( bBottomtBoxSizer, 1, wxALIGN_CENTER|wxEXPAND, 5 ); + bPropertiesSizer->Add( bBottomtBoxSizer, 1, wxEXPAND, 5 ); wxBoxSizer* bRightSizer; bRightSizer = new wxBoxSizer( wxVERTICAL ); diff --git a/eeschema/dialogs/dialog_lib_edit_text_base.fbp b/eeschema/dialogs/dialog_lib_edit_text_base.fbp index fd885ec994..a4f491cf35 100644 --- a/eeschema/dialogs/dialog_lib_edit_text_base.fbp +++ b/eeschema/dialogs/dialog_lib_edit_text_base.fbp @@ -667,7 +667,7 @@ 5 - wxALIGN_CENTER|wxEXPAND + wxEXPAND 1 diff --git a/eeschema/dialogs/dialog_lib_edit_text_base.h b/eeschema/dialogs/dialog_lib_edit_text_base.h index 1580543e55..f026076181 100644 --- a/eeschema/dialogs/dialog_lib_edit_text_base.h +++ b/eeschema/dialogs/dialog_lib_edit_text_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! diff --git a/eeschema/dialogs/dialog_lib_new_component.fbp b/eeschema/dialogs/dialog_lib_new_component.fbp index 611c679807..01560a97a9 100644 --- a/eeschema/dialogs/dialog_lib_new_component.fbp +++ b/eeschema/dialogs/dialog_lib_new_component.fbp @@ -1,6 +1,6 @@ - + C++ @@ -286,7 +286,7 @@ 3 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + wxALL|wxEXPAND 1 1 diff --git a/eeschema/dialogs/dialog_lib_new_component_base.cpp b/eeschema/dialogs/dialog_lib_new_component_base.cpp index 0bc9fe1253..35910e8015 100644 --- a/eeschema/dialogs/dialog_lib_new_component_base.cpp +++ b/eeschema/dialogs/dialog_lib_new_component_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 5 2013) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -39,7 +39,7 @@ DIALOG_LIB_NEW_COMPONENT_BASE::DIALOG_LIB_NEW_COMPONENT_BASE( wxWindow* parent, m_textName = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 100,-1 ), 0 ); m_textName->SetMaxLength( 0 ); - fgSizer31->Add( m_textName, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); + fgSizer31->Add( m_textName, 1, wxALL|wxEXPAND, 3 ); m_staticText9 = new wxStaticText( this, wxID_ANY, _("Default reference designator:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText9->Wrap( -1 ); diff --git a/eeschema/dialogs/dialog_lib_new_component_base.h b/eeschema/dialogs/dialog_lib_new_component_base.h index e48977dcfe..e90c52c076 100644 --- a/eeschema/dialogs/dialog_lib_new_component_base.h +++ b/eeschema/dialogs/dialog_lib_new_component_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 5 2013) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! diff --git a/eeschema/dialogs/dialog_libedit_dimensions_base.cpp b/eeschema/dialogs/dialog_libedit_dimensions_base.cpp index 2027277843..c11dbe22a2 100644 --- a/eeschema/dialogs/dialog_libedit_dimensions_base.cpp +++ b/eeschema/dialogs/dialog_libedit_dimensions_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 16 2008) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -38,7 +38,7 @@ DIALOG_LIBEDIT_DIMENSIONS_BASE::DIALOG_LIBEDIT_DIMENSIONS_BASE( wxWindow* parent int m_choiceGridSizeNChoices = sizeof( m_choiceGridSizeChoices ) / sizeof( wxString ); m_choiceGridSize = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceGridSizeNChoices, m_choiceGridSizeChoices, 0 ); m_choiceGridSize->SetSelection( 0 ); - fgSizer1->Add( m_choiceGridSize, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); + fgSizer1->Add( m_choiceGridSize, 0, wxALL|wxEXPAND, 3 ); m_staticGridUnits = new wxStaticText( this, wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticGridUnits->Wrap( -1 ); @@ -49,6 +49,7 @@ DIALOG_LIBEDIT_DIMENSIONS_BASE::DIALOG_LIBEDIT_DIMENSIONS_BASE( wxWindow* parent fgSizer1->Add( m_staticText5, 1, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); m_CurrentGraphicLineThicknessCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_CurrentGraphicLineThicknessCtrl->SetMaxLength( 0 ); fgSizer1->Add( m_CurrentGraphicLineThicknessCtrl, 0, wxALL|wxEXPAND, 5 ); m_staticLineWidthUnits = new wxStaticText( this, wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -60,6 +61,7 @@ DIALOG_LIBEDIT_DIMENSIONS_BASE::DIALOG_LIBEDIT_DIMENSIONS_BASE( wxWindow* parent fgSizer1->Add( m_staticText7, 1, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); m_CurrentGraphicTextSizeCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_CurrentGraphicTextSizeCtrl->SetMaxLength( 0 ); fgSizer1->Add( m_CurrentGraphicTextSizeCtrl, 0, wxALL|wxEXPAND, 5 ); m_staticTextSizeUnits = new wxStaticText( this, wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -99,6 +101,7 @@ DIALOG_LIBEDIT_DIMENSIONS_BASE::DIALOG_LIBEDIT_DIMENSIONS_BASE( wxWindow* parent fgSizer1->Add( m_staticText15, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); m_CurrentPinLenghtCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_CurrentPinLenghtCtrl->SetMaxLength( 0 ); fgSizer1->Add( m_CurrentPinLenghtCtrl, 0, wxEXPAND|wxALL, 5 ); m_staticText161 = new wxStaticText( this, wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -110,6 +113,7 @@ DIALOG_LIBEDIT_DIMENSIONS_BASE::DIALOG_LIBEDIT_DIMENSIONS_BASE( wxWindow* parent fgSizer1->Add( m_CurrentPinNameSizeText, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); m_CurrentPinNameSizeCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_CurrentPinNameSizeCtrl->SetMaxLength( 0 ); fgSizer1->Add( m_CurrentPinNameSizeCtrl, 0, wxALL|wxEXPAND, 5 ); m_staticText18 = new wxStaticText( this, wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -121,6 +125,7 @@ DIALOG_LIBEDIT_DIMENSIONS_BASE::DIALOG_LIBEDIT_DIMENSIONS_BASE( wxWindow* parent fgSizer1->Add( m_CurrentPinNumberSizeText, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); m_CurrentPinNumberSizeCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_CurrentPinNumberSizeCtrl->SetMaxLength( 0 ); fgSizer1->Add( m_CurrentPinNumberSizeCtrl, 0, wxALL|wxEXPAND, 5 ); m_staticText20 = new wxStaticText( this, wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -132,12 +137,13 @@ DIALOG_LIBEDIT_DIMENSIONS_BASE::DIALOG_LIBEDIT_DIMENSIONS_BASE( wxWindow* parent fgSizer1->Add( m_staticText16, 0, wxALL|wxALIGN_CENTER_VERTICAL, 3 ); m_spinRepeatLabel = new wxSpinCtrl( this, wxID_ANY, wxT("1"), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_WRAP, 0, 10, 1 ); - fgSizer1->Add( m_spinRepeatLabel, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); + fgSizer1->Add( m_spinRepeatLabel, 0, wxALL|wxEXPAND, 3 ); - fgSizer1->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 3 ); + fgSizer1->Add( 0, 0, 1, wxEXPAND, 3 ); - mainSizer->Add( fgSizer1, 0, wxALIGN_CENTER|wxEXPAND, 0 ); + + mainSizer->Add( fgSizer1, 0, wxEXPAND, 0 ); m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); mainSizer->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 ); @@ -154,10 +160,13 @@ DIALOG_LIBEDIT_DIMENSIONS_BASE::DIALOG_LIBEDIT_DIMENSIONS_BASE( wxWindow* parent m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1->Realize(); + bSizerBttons->Add( m_sdbSizer1, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 0 ); + mainSizer->Add( bSizerBttons, 0, wxALIGN_RIGHT, 5 ); + this->SetSizer( mainSizer ); this->Layout(); diff --git a/eeschema/dialogs/dialog_libedit_dimensions_base.fbp b/eeschema/dialogs/dialog_libedit_dimensions_base.fbp index 0c3540751b..a0fc3b81fb 100644 --- a/eeschema/dialogs/dialog_libedit_dimensions_base.fbp +++ b/eeschema/dialogs/dialog_libedit_dimensions_base.fbp @@ -1,10 +1,14 @@ - + - + C++ 1 + source_name + 0 + 0 + res UTF-8 table dialog_libedit_dimensions_base @@ -12,80 +16,94 @@ none 1 dialog_libedit_dimensions_base - + . - + 1 + 1 + 1 + 1 + UI 1 0 - + 0 + wxAUI_MGR_DEFAULT + wxBOTH - + + 1 1 - - - + impl_virtual + + + 0 wxID_ANY - - + + DIALOG_LIBEDIT_DIMENSIONS_BASE - + 412,349 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - + Library Editor Options - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + mainSizer wxVERTICAL none 0 - wxALIGN_CENTER|wxEXPAND + wxEXPAND 0 3 wxHORIZONTAL 0,1,2 - + 0 - + fgSizer1 wxFLEX_GROWMODE_SPECIFIED none @@ -96,101 +114,170 @@ wxALIGN_CENTER_VERTICAL|wxALL 1 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY &Grid size: - - + + 0 + + + 0 + + 1 m_staticText3 + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + 3 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + wxALL|wxEXPAND 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 "50" "25" "10" "5" "2" "1" - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - - + + 0 + + + 0 + + 1 m_choiceGridSize + 1 + + protected - + 1 + + Resizable 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -198,50 +285,82 @@ wxALIGN_CENTER_VERTICAL|wxALL 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY mils - - + + 0 + + + 0 + + 1 m_staticGridUnits + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -249,50 +368,82 @@ wxALIGN_CENTER_VERTICAL|wxALL 1 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Current graphic &line width: - - + + 0 + + + 0 + + 1 m_staticText5 + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -300,54 +451,90 @@ wxALL|wxEXPAND 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - + + 0 + 0 - + + 0 + + 1 m_CurrentGraphicLineThicknessCtrl + 1 + + protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -355,50 +542,82 @@ wxALIGN_CENTER_VERTICAL|wxALL 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY mils - - + + 0 + + + 0 + + 1 m_staticLineWidthUnits + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -406,50 +625,82 @@ wxALIGN_CENTER_VERTICAL|wxALL 1 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Current graphic text &size: - - + + 0 + + + 0 + + 1 m_staticText7 + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -457,54 +708,90 @@ wxALL|wxEXPAND 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - + + 0 + 0 - + + 0 + + 1 m_CurrentGraphicTextSizeCtrl + 1 + + protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -512,50 +799,82 @@ wxALIGN_CENTER_VERTICAL|wxALL 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY mils - - + + 0 + + + 0 + + 1 m_staticTextSizeUnits + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -563,50 +882,82 @@ wxALIGN_CENTER_VERTICAL|wxALL 1 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Repeat draw item &horizontal displacement: - - + + 0 + + + 0 + + 1 m_staticText9 + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -614,50 +965,87 @@ wxALL|wxEXPAND 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 "50" "25" - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - - + + 0 + + + 0 + + 1 m_choiceRepeatHorizontal + 1 + + protected - + 1 + + Resizable 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -665,50 +1053,82 @@ wxALIGN_CENTER_VERTICAL|wxALL 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY mils - - + + 0 + + + 0 + + 1 m_staticRepeatXUnits + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -716,50 +1136,82 @@ wxALIGN_CENTER_VERTICAL|wxALL 1 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Repeat draw item &vertical displacement: - - + + 0 + + + 0 + + 1 m_staticText12 + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -767,50 +1219,87 @@ wxALL|wxEXPAND 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 "50" "25" - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - - + + 0 + + + 0 + + 1 m_choiceRepeatVertical + 1 + + protected - + 1 + + Resizable 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -818,50 +1307,82 @@ wxALIGN_CENTER_VERTICAL|wxALL 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY mils - - + + 0 + + + 0 + + 1 m_staticRepeatYUnits + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -869,50 +1390,82 @@ wxALL|wxALIGN_CENTER_VERTICAL 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Current &pin lenght: - - + + 0 + + + 0 + + 1 m_staticText15 + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -920,54 +1473,90 @@ wxEXPAND|wxALL 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - + + 0 + 0 - + + 0 + + 1 m_CurrentPinLenghtCtrl + 1 + + protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -975,50 +1564,82 @@ wxALL 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY mils - - + + 0 + + + 0 + + 1 m_staticText161 + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1026,50 +1647,82 @@ wxALL|wxALIGN_CENTER_VERTICAL 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Current pin name size: - - + + 0 + + + 0 + + 1 m_CurrentPinNameSizeText + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1077,54 +1730,90 @@ wxALL|wxEXPAND 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - + + 0 + 0 - + + 0 + + 1 m_CurrentPinNameSizeCtrl + 1 + + protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1132,50 +1821,82 @@ wxALL 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY mils - - + + 0 + + + 0 + + 1 m_staticText18 + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1183,50 +1904,82 @@ wxALL|wxALIGN_CENTER_VERTICAL 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Current pin number size: - - + + 0 + + + 0 + + 1 m_CurrentPinNumberSizeText + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1234,54 +1987,90 @@ wxALL|wxEXPAND 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - + + 0 + 0 - + + 0 + + 1 m_CurrentPinNumberSizeCtrl + 1 + + protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1289,50 +2078,82 @@ wxALL 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY mils - - + + 0 + + + 0 + + 1 m_staticText20 + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1340,110 +2161,175 @@ wxALL|wxALIGN_CENTER_VERTICAL 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY &Repeat pin number increment: - - + + 0 + + + 0 + + 1 m_staticText16 + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + 3 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + wxALL|wxEXPAND 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY 1 10 - + + 0 + 0 - + + 0 + + 1 m_spinRepeatLabel + 1 + + protected - - + 1 + + Resizable + 1 + wxSP_ARROW_KEYS|wxSP_WRAP - - + + 0 + 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 - wxALIGN_CENTER_VERTICAL|wxEXPAND + wxEXPAND 1 0 @@ -1458,48 +2344,80 @@ wxEXPAND | wxALL 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - - + + 0 + + + 0 + + 1 m_staticline1 + 1 + + protected - - + 1 + + Resizable + 1 + wxLI_HORIZONTAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1507,7 +2425,7 @@ wxALIGN_RIGHT 0 - + bSizerBttons wxHORIZONTAL none @@ -1516,51 +2434,87 @@ wxALL 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 0 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Save as Default - - + + 0 + + + 0 + + 1 m_buttonSave + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + OnSaveSetupClick - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1576,17 +2530,17 @@ 1 0 0 - + m_sdbSizer1 protected - + OnCancelClick - - - + + + OnOkClick - - + + diff --git a/eeschema/dialogs/dialog_libedit_dimensions_base.h b/eeschema/dialogs/dialog_libedit_dimensions_base.h index 32b32c1df3..f8607a6b6a 100644 --- a/eeschema/dialogs/dialog_libedit_dimensions_base.h +++ b/eeschema/dialogs/dialog_libedit_dimensions_base.h @@ -1,15 +1,16 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 16 2008) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#ifndef __dialog_libedit_dimensions_base__ -#define __dialog_libedit_dimensions_base__ +#ifndef __DIALOG_LIBEDIT_DIMENSIONS_BASE_H__ +#define __DIALOG_LIBEDIT_DIMENSIONS_BASE_H__ +#include +#include #include - #include #include #include @@ -67,7 +68,6 @@ class DIALOG_LIBEDIT_DIMENSIONS_BASE : public wxDialog wxStaticText* m_staticText20; wxStaticText* m_staticText16; wxSpinCtrl* m_spinRepeatLabel; - wxStaticLine* m_staticline1; wxButton* m_buttonSave; wxStdDialogButtonSizer* m_sdbSizer1; @@ -75,15 +75,16 @@ class DIALOG_LIBEDIT_DIMENSIONS_BASE : public wxDialog wxButton* m_sdbSizer1Cancel; // Virtual event handlers, overide them in your derived class - virtual void OnSaveSetupClick( wxCommandEvent& event ){ event.Skip(); } - virtual void OnCancelClick( wxCommandEvent& event ){ event.Skip(); } - virtual void OnOkClick( wxCommandEvent& event ){ event.Skip(); } + virtual void OnSaveSetupClick( wxCommandEvent& event ) { event.Skip(); } + virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); } + virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); } public: - DIALOG_LIBEDIT_DIMENSIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Library Editor Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 412,349 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + + DIALOG_LIBEDIT_DIMENSIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Library Editor Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 412,349 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_LIBEDIT_DIMENSIONS_BASE(); }; -#endif //__dialog_libedit_dimensions_base__ +#endif //__DIALOG_LIBEDIT_DIMENSIONS_BASE_H__ diff --git a/eeschema/dialogs/dialog_libedit_options_base.cpp b/eeschema/dialogs/dialog_libedit_options_base.cpp index 597b7a6be3..da29b8b543 100644 --- a/eeschema/dialogs/dialog_libedit_options_base.cpp +++ b/eeschema/dialogs/dialog_libedit_options_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -40,7 +40,7 @@ DIALOG_LIBEDIT_OPTIONS_BASE::DIALOG_LIBEDIT_OPTIONS_BASE( wxWindow* parent, wxWi wxArrayString m_choiceGridSizeChoices; m_choiceGridSize = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceGridSizeChoices, 0 ); m_choiceGridSize->SetSelection( 0 ); - fgSizer->Add( m_choiceGridSize, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALL, 3 ); + fgSizer->Add( m_choiceGridSize, 0, wxEXPAND|wxALL, 3 ); m_staticGridUnits = new wxStaticText( this, wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticGridUnits->Wrap( -1 ); @@ -51,7 +51,7 @@ DIALOG_LIBEDIT_OPTIONS_BASE::DIALOG_LIBEDIT_OPTIONS_BASE( wxWindow* parent, wxWi fgSizer->Add( m_staticText5, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 3 ); m_spinLineWidth = new wxSpinCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_WRAP, 1, 100, 6 ); - fgSizer->Add( m_spinLineWidth, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); + fgSizer->Add( m_spinLineWidth, 0, wxALL|wxEXPAND, 3 ); m_staticLineWidthUnits = new wxStaticText( this, wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticLineWidthUnits->Wrap( -1 ); @@ -62,7 +62,7 @@ DIALOG_LIBEDIT_OPTIONS_BASE::DIALOG_LIBEDIT_OPTIONS_BASE( wxWindow* parent, wxWi fgSizer->Add( m_staticText52, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 3 ); m_spinPinLength = new wxSpinCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_WRAP, 50, 1000, 200 ); - fgSizer->Add( m_spinPinLength, 0, wxALIGN_CENTER|wxALL|wxEXPAND, 3 ); + fgSizer->Add( m_spinPinLength, 0, wxALL|wxEXPAND, 3 ); m_staticPinLengthUnits = new wxStaticText( this, wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticPinLengthUnits->Wrap( -1 ); @@ -73,7 +73,7 @@ DIALOG_LIBEDIT_OPTIONS_BASE::DIALOG_LIBEDIT_OPTIONS_BASE( wxWindow* parent, wxWi fgSizer->Add( m_staticText7, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 3 ); m_spinPinNumSize = new wxSpinCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_WRAP, 0, 1000, 0 ); - fgSizer->Add( m_spinPinNumSize, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); + fgSizer->Add( m_spinPinNumSize, 0, wxALL|wxEXPAND, 3 ); m_staticTextSizeUnits = new wxStaticText( this, wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextSizeUnits->Wrap( -1 ); @@ -84,7 +84,7 @@ DIALOG_LIBEDIT_OPTIONS_BASE::DIALOG_LIBEDIT_OPTIONS_BASE( wxWindow* parent, wxWi fgSizer->Add( m_staticText9, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 3 ); m_spinPinNameSize = new wxSpinCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_WRAP, -5000, 5000, 0 ); - fgSizer->Add( m_spinPinNameSize, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); + fgSizer->Add( m_spinPinNameSize, 0, wxALL|wxEXPAND, 3 ); m_staticRepeatXUnits = new wxStaticText( this, wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticRepeatXUnits->Wrap( -1 ); @@ -95,7 +95,7 @@ DIALOG_LIBEDIT_OPTIONS_BASE::DIALOG_LIBEDIT_OPTIONS_BASE( wxWindow* parent, wxWi fgSizer->Add( m_staticText11, 0, wxALL, 5 ); m_spinRepeatHorizontal = new wxSpinCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, -1000, 1000, 0 ); - fgSizer->Add( m_spinRepeatHorizontal, 0, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 ); + fgSizer->Add( m_spinRepeatHorizontal, 0, wxALL|wxEXPAND, 5 ); m_staticText12 = new wxStaticText( this, wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText12->Wrap( -1 ); @@ -131,13 +131,13 @@ DIALOG_LIBEDIT_OPTIONS_BASE::DIALOG_LIBEDIT_OPTIONS_BASE( wxWindow* parent, wxWi fgSizer->Add( m_staticText17, 0, wxALL, 5 ); m_spinRepeatLabel = new wxSpinCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, -10, 10, 1 ); - fgSizer->Add( m_spinRepeatLabel, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + fgSizer->Add( m_spinRepeatLabel, 0, wxALL|wxEXPAND, 5 ); fgSizer->Add( 0, 0, 0, 0, 5 ); - bSizer3->Add( fgSizer, 0, wxALIGN_CENTER|wxEXPAND, 0 ); + bSizer3->Add( fgSizer, 0, wxEXPAND, 0 ); wxBoxSizer* bSizer2; bSizer2 = new wxBoxSizer( wxVERTICAL ); diff --git a/eeschema/dialogs/dialog_libedit_options_base.fbp b/eeschema/dialogs/dialog_libedit_options_base.fbp index 6d1cfafef9..7d16d33448 100644 --- a/eeschema/dialogs/dialog_libedit_options_base.fbp +++ b/eeschema/dialogs/dialog_libedit_options_base.fbp @@ -122,7 +122,7 @@ none 0 - wxALIGN_CENTER|wxEXPAND + wxEXPAND 0 3 @@ -221,7 +221,7 @@ 3 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALL + wxEXPAND|wxALL 0 1 @@ -475,7 +475,7 @@ 3 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -729,7 +729,7 @@ 3 - wxALIGN_CENTER|wxALL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -983,7 +983,7 @@ 3 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -1237,7 +1237,7 @@ 3 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -1491,7 +1491,7 @@ 5 - wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL + wxALL|wxEXPAND 0 1 @@ -2253,7 +2253,7 @@ 5 - wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND + wxALL|wxEXPAND 0 1 diff --git a/eeschema/dialogs/dialog_libedit_options_base.h b/eeschema/dialogs/dialog_libedit_options_base.h index 2b43354c44..833b56b111 100644 --- a/eeschema/dialogs/dialog_libedit_options_base.h +++ b/eeschema/dialogs/dialog_libedit_options_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! diff --git a/eeschema/dialogs/dialog_netlist.cpp b/eeschema/dialogs/dialog_netlist.cpp index 9c797e5b4f..2caac6c154 100644 --- a/eeschema/dialogs/dialog_netlist.cpp +++ b/eeschema/dialogs/dialog_netlist.cpp @@ -396,7 +396,7 @@ void NETLIST_DIALOG::InstallPageSpice() page->m_CommandStringCtrl->SetInsertionPoint( 1 ); page->m_LowBoxSizer->Add( page->m_CommandStringCtrl, 0, - wxGROW | wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT | wxBOTTOM, + wxGROW | wxLEFT | wxRIGHT | wxBOTTOM, 5 ); // Add buttons diff --git a/eeschema/dialogs/dialog_netlist_base.cpp b/eeschema/dialogs/dialog_netlist_base.cpp index 6d7ebd913f..39a8d0de33 100644 --- a/eeschema/dialogs/dialog_netlist_base.cpp +++ b/eeschema/dialogs/dialog_netlist_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 6 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -44,16 +44,16 @@ NETLIST_DIALOG_BASE::NETLIST_DIALOG_BASE( wxWindow* parent, wxWindowID id, const bLeftSizer->Add( 0, 0, 0, wxTOP, 15 ); m_buttonNetlist = new wxButton( this, ID_CREATE_NETLIST, _("Generate"), wxDefaultPosition, wxDefaultSize, 0 ); - bLeftSizer->Add( m_buttonNetlist, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); + bLeftSizer->Add( m_buttonNetlist, 0, wxALL|wxEXPAND, 5 ); m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); - bLeftSizer->Add( m_buttonCancel, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); + bLeftSizer->Add( m_buttonCancel, 0, wxALL|wxEXPAND, 5 ); m_buttonAddPlugin = new wxButton( this, ID_ADD_PLUGIN, _("Add Plugin"), wxDefaultPosition, wxDefaultSize, 0 ); - bLeftSizer->Add( m_buttonAddPlugin, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); + bLeftSizer->Add( m_buttonAddPlugin, 0, wxALL|wxEXPAND, 5 ); m_buttonDelPlugin = new wxButton( this, ID_DEL_PLUGIN, _("Remove Plugin"), wxDefaultPosition, wxDefaultSize, 0 ); - bLeftSizer->Add( m_buttonDelPlugin, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); + bLeftSizer->Add( m_buttonDelPlugin, 0, wxALL|wxEXPAND, 5 ); m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); bLeftSizer->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 ); diff --git a/eeschema/dialogs/dialog_netlist_base.fbp b/eeschema/dialogs/dialog_netlist_base.fbp index 8d8d016a53..c435a73983 100644 --- a/eeschema/dialogs/dialog_netlist_base.fbp +++ b/eeschema/dialogs/dialog_netlist_base.fbp @@ -218,7 +218,7 @@ 5 - wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -306,7 +306,7 @@ 5 - wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -394,7 +394,7 @@ 5 - wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -482,7 +482,7 @@ 5 - wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND + wxALL|wxEXPAND 0 1 diff --git a/eeschema/dialogs/dialog_netlist_base.h b/eeschema/dialogs/dialog_netlist_base.h index c6ed9a6e54..6cfeda28d8 100644 --- a/eeschema/dialogs/dialog_netlist_base.h +++ b/eeschema/dialogs/dialog_netlist_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 6 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! diff --git a/eeschema/dialogs/dialog_plot_schematic_base.cpp b/eeschema/dialogs/dialog_plot_schematic_base.cpp index 38ae92464f..89f40a9dbb 100644 --- a/eeschema/dialogs/dialog_plot_schematic_base.cpp +++ b/eeschema/dialogs/dialog_plot_schematic_base.cpp @@ -30,7 +30,7 @@ DIALOG_PLOT_SCHEMATIC_BASE::DIALOG_PLOT_SCHEMATIC_BASE( wxWindow* parent, wxWind m_outputDirectoryName->SetMaxLength( 0 ); m_outputDirectoryName->SetToolTip( _("Target directory for plot files. Can be absolute or relative to the schematic main file location.") ); - bSizer5->Add( m_outputDirectoryName, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT, 5 ); + bSizer5->Add( m_outputDirectoryName, 1, wxEXPAND|wxLEFT|wxRIGHT, 5 ); m_browseButton = new wxButton( this, wxID_ANY, _("Browse..."), wxDefaultPosition, wxDefaultSize, 0 ); bSizer5->Add( m_browseButton, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); @@ -123,14 +123,14 @@ DIALOG_PLOT_SCHEMATIC_BASE::DIALOG_PLOT_SCHEMATIC_BASE( wxWindow* parent, wxWind m_buttonPlotCurrent = new wxButton( this, wxID_PRINT_CURRENT, _("Plot Current Page"), wxDefaultPosition, wxDefaultSize, 0 ); m_buttonPlotCurrent->SetDefault(); - m_ButtonsSizer->Add( m_buttonPlotCurrent, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); + m_ButtonsSizer->Add( m_buttonPlotCurrent, 0, wxALL|wxEXPAND, 5 ); m_buttonPlotAll = new wxButton( this, wxID_PRINT_ALL, _("Plot All Pages"), wxDefaultPosition, wxDefaultSize, 0 ); m_buttonPlotAll->SetDefault(); - m_ButtonsSizer->Add( m_buttonPlotAll, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); + m_ButtonsSizer->Add( m_buttonPlotAll, 0, wxALL|wxEXPAND, 5 ); m_buttonQuit = new wxButton( this, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 ); - m_ButtonsSizer->Add( m_buttonQuit, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); + m_ButtonsSizer->Add( m_buttonQuit, 0, wxALL|wxEXPAND, 5 ); m_optionsSizer->Add( m_ButtonsSizer, 0, wxALIGN_CENTER_VERTICAL, 5 ); diff --git a/eeschema/dialogs/dialog_plot_schematic_base.fbp b/eeschema/dialogs/dialog_plot_schematic_base.fbp index 280cd023ae..83a21d3697 100644 --- a/eeschema/dialogs/dialog_plot_schematic_base.fbp +++ b/eeschema/dialogs/dialog_plot_schematic_base.fbp @@ -196,7 +196,7 @@ none 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT + wxEXPAND|wxLEFT|wxRIGHT 1 1 @@ -1406,7 +1406,7 @@ protected 5 - wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -1494,7 +1494,7 @@ 5 - wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -1582,7 +1582,7 @@ 5 - wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND + wxALL|wxEXPAND 0 1 diff --git a/eeschema/dialogs/dialog_print_using_printer_base.cpp b/eeschema/dialogs/dialog_print_using_printer_base.cpp index d57997b26f..6a163b1eab 100644 --- a/eeschema/dialogs/dialog_print_using_printer_base.cpp +++ b/eeschema/dialogs/dialog_print_using_printer_base.cpp @@ -42,16 +42,16 @@ DIALOG_PRINT_USING_PRINTER_BASE::DIALOG_PRINT_USING_PRINTER_BASE( wxWindow* pare bbuttonsSizer = new wxBoxSizer( wxVERTICAL ); m_buttonPageSetup = new wxButton( this, wxID_ANY, _("Page Setup"), wxDefaultPosition, wxDefaultSize, 0 ); - bbuttonsSizer->Add( m_buttonPageSetup, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 5 ); + bbuttonsSizer->Add( m_buttonPageSetup, 0, wxALL|wxEXPAND, 5 ); m_buttonPreview = new wxButton( this, wxID_ANY, _("Preview"), wxDefaultPosition, wxDefaultSize, 0 ); - bbuttonsSizer->Add( m_buttonPreview, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); + bbuttonsSizer->Add( m_buttonPreview, 0, wxALL|wxEXPAND, 5 ); m_buttonPrint = new wxButton( this, wxID_ANY, _("Print"), wxDefaultPosition, wxDefaultSize, 0 ); - bbuttonsSizer->Add( m_buttonPrint, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); + bbuttonsSizer->Add( m_buttonPrint, 0, wxALL|wxEXPAND, 5 ); m_buttonQuit = new wxButton( this, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 ); - bbuttonsSizer->Add( m_buttonQuit, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); + bbuttonsSizer->Add( m_buttonQuit, 0, wxALL|wxEXPAND, 5 ); bMainSizer->Add( bbuttonsSizer, 0, wxALL, 12 ); diff --git a/eeschema/dialogs/dialog_print_using_printer_base.fbp b/eeschema/dialogs/dialog_print_using_printer_base.fbp index 1a42437aa8..cf785e1e1e 100644 --- a/eeschema/dialogs/dialog_print_using_printer_base.fbp +++ b/eeschema/dialogs/dialog_print_using_printer_base.fbp @@ -374,7 +374,7 @@ none 5 - wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -462,7 +462,7 @@ 5 - wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -550,7 +550,7 @@ 5 - wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -638,7 +638,7 @@ 5 - wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND + wxALL|wxEXPAND 0 1 diff --git a/eeschema/dialogs/dialog_sch_edit_sheet_pin_base.fbp b/eeschema/dialogs/dialog_sch_edit_sheet_pin_base.fbp index 919a60930a..f5c7863a12 100644 --- a/eeschema/dialogs/dialog_sch_edit_sheet_pin_base.fbp +++ b/eeschema/dialogs/dialog_sch_edit_sheet_pin_base.fbp @@ -203,7 +203,7 @@ 6 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -387,7 +387,7 @@ 6 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -644,7 +644,7 @@ 6 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT 0 1 diff --git a/eeschema/dialogs/dialog_sch_sheet_props.fbp b/eeschema/dialogs/dialog_sch_sheet_props.fbp index 3b8b661cd8..93347cc490 100644 --- a/eeschema/dialogs/dialog_sch_sheet_props.fbp +++ b/eeschema/dialogs/dialog_sch_sheet_props.fbp @@ -203,7 +203,7 @@ 3 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxBOTTOM + wxEXPAND|wxTOP|wxBOTTOM 5 1 @@ -644,7 +644,7 @@ 3 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxBOTTOM + wxEXPAND|wxTOP|wxBOTTOM 5 1 @@ -1287,7 +1287,7 @@ 5 - wxEXPAND|wxTOP|wxBOTTOM|wxALIGN_CENTER_VERTICAL + wxEXPAND|wxTOP|wxBOTTOM 0 1 diff --git a/eeschema/dialogs/dialog_sch_sheet_props_base.cpp b/eeschema/dialogs/dialog_sch_sheet_props_base.cpp index 60608965cb..f85225b1ef 100644 --- a/eeschema/dialogs/dialog_sch_sheet_props_base.cpp +++ b/eeschema/dialogs/dialog_sch_sheet_props_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -33,7 +33,7 @@ DIALOG_SCH_SHEET_PROPS_BASE::DIALOG_SCH_SHEET_PROPS_BASE( wxWindow* parent, wxWi m_textFileName->SetMaxLength( 0 ); m_textFileName->SetMinSize( wxSize( 200,-1 ) ); - fgSizer1->Add( m_textFileName, 5, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxBOTTOM, 3 ); + fgSizer1->Add( m_textFileName, 5, wxEXPAND|wxTOP|wxBOTTOM, 3 ); fgSizer1->Add( 0, 0, 1, wxALIGN_CENTER_HORIZONTAL|wxALL, 3 ); @@ -56,7 +56,7 @@ DIALOG_SCH_SHEET_PROPS_BASE::DIALOG_SCH_SHEET_PROPS_BASE( wxWindow* parent, wxWi m_textSheetName = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_textSheetName->SetMaxLength( 0 ); - fgSizer1->Add( m_textSheetName, 5, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxBOTTOM, 3 ); + fgSizer1->Add( m_textSheetName, 5, wxEXPAND|wxTOP|wxBOTTOM, 3 ); fgSizer1->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); @@ -96,7 +96,7 @@ DIALOG_SCH_SHEET_PROPS_BASE::DIALOG_SCH_SHEET_PROPS_BASE( wxWindow* parent, wxWi fgSizer1->Add( m_staticTextTimeStamp, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); m_textCtrlTimeStamp = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY ); - fgSizer1->Add( m_textCtrlTimeStamp, 0, wxEXPAND|wxTOP|wxBOTTOM|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizer1->Add( m_textCtrlTimeStamp, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 ); bupperSizer->Add( fgSizer1, 1, wxALL|wxEXPAND, 5 ); diff --git a/eeschema/dialogs/dialog_sch_sheet_props_base.h b/eeschema/dialogs/dialog_sch_sheet_props_base.h index 1b96203ddc..46a438a6be 100644 --- a/eeschema/dialogs/dialog_sch_sheet_props_base.h +++ b/eeschema/dialogs/dialog_sch_sheet_props_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! diff --git a/eeschema/dialogs/dialog_schematic_find_base.cpp b/eeschema/dialogs/dialog_schematic_find_base.cpp index be83319212..59f78e2ea3 100644 --- a/eeschema/dialogs/dialog_schematic_find_base.cpp +++ b/eeschema/dialogs/dialog_schematic_find_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 8 2012) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -27,13 +27,13 @@ DIALOG_SCH_FIND_BASE::DIALOG_SCH_FIND_BASE( wxWindow* parent, wxWindowID id, con m_staticText1 = new wxStaticText( this, wxID_ANY, _("&Search for:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText1->Wrap( -1 ); - leftGridSizer->Add( m_staticText1, 0, wxALIGN_BOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 6 ); + leftGridSizer->Add( m_staticText1, 0, wxEXPAND|wxLEFT|wxRIGHT, 6 ); m_comboFind = new wxComboBox( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_DROPDOWN ); m_comboFind->SetToolTip( _("Text with optional wildcards") ); m_comboFind->SetMinSize( wxSize( 125,-1 ) ); - leftGridSizer->Add( m_comboFind, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT, 6 ); + leftGridSizer->Add( m_comboFind, 1, wxEXPAND|wxLEFT|wxRIGHT, 6 ); m_staticReplace = new wxStaticText( this, wxID_ANY, _("Replace &with:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticReplace->Wrap( -1 ); @@ -44,7 +44,7 @@ DIALOG_SCH_FIND_BASE::DIALOG_SCH_FIND_BASE( wxWindow* parent, wxWindowID id, con m_comboReplace = new wxComboBox( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); m_comboReplace->Hide(); - leftGridSizer->Add( m_comboReplace, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 5 ); + leftGridSizer->Add( m_comboReplace, 0, wxALL|wxEXPAND, 5 ); m_staticDirection = new wxStaticText( this, wxID_ANY, _("Direction:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticDirection->Wrap( -1 ); diff --git a/eeschema/dialogs/dialog_schematic_find_base.fbp b/eeschema/dialogs/dialog_schematic_find_base.fbp index 20989817bd..5a759742d0 100644 --- a/eeschema/dialogs/dialog_schematic_find_base.fbp +++ b/eeschema/dialogs/dialog_schematic_find_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -20,8 +20,10 @@ . 1 + 1 1 1 + UI 0 0 @@ -118,7 +120,7 @@ 3 6 - wxALIGN_BOTTOM|wxEXPAND|wxLEFT|wxRIGHT + wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -201,7 +203,7 @@ 6 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT + wxEXPAND|wxLEFT|wxRIGHT 1 1 @@ -375,7 +377,7 @@ 5 - wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND + wxALL|wxEXPAND 0 1 diff --git a/eeschema/dialogs/dialog_schematic_find_base.h b/eeschema/dialogs/dialog_schematic_find_base.h index 6b17c61ae0..9fe0de458f 100644 --- a/eeschema/dialogs/dialog_schematic_find_base.h +++ b/eeschema/dialogs/dialog_schematic_find_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 8 2012) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! diff --git a/gerbview/dialogs/dialog_print_using_printer_base.cpp b/gerbview/dialogs/dialog_print_using_printer_base.cpp index 52152d9182..1202588be2 100644 --- a/gerbview/dialogs/dialog_print_using_printer_base.cpp +++ b/gerbview/dialogs/dialog_print_using_printer_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 8 2012) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -97,17 +97,17 @@ DIALOG_PRINT_USING_PRINTER_BASE::DIALOG_PRINT_USING_PRINTER_BASE( wxWindow* pare b_buttonsSizer = new wxBoxSizer( wxVERTICAL ); m_buttonOption = new wxButton( this, wxID_PRINT_OPTIONS, _("Page Options"), wxDefaultPosition, wxDefaultSize, 0 ); - b_buttonsSizer->Add( m_buttonOption, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); + b_buttonsSizer->Add( m_buttonOption, 0, wxALL|wxEXPAND, 5 ); m_buttonPreview = new wxButton( this, wxID_PREVIEW, _("Preview"), wxDefaultPosition, wxDefaultSize, 0 ); - b_buttonsSizer->Add( m_buttonPreview, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); + b_buttonsSizer->Add( m_buttonPreview, 0, wxALL|wxEXPAND, 5 ); m_buttonPrint = new wxButton( this, wxID_PRINT_ALL, _("Print"), wxDefaultPosition, wxDefaultSize, 0 ); m_buttonPrint->SetDefault(); - b_buttonsSizer->Add( m_buttonPrint, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); + b_buttonsSizer->Add( m_buttonPrint, 0, wxALL|wxEXPAND, 5 ); m_buttonQuit = new wxButton( this, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 ); - b_buttonsSizer->Add( m_buttonQuit, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); + b_buttonsSizer->Add( m_buttonQuit, 0, wxALL|wxEXPAND, 5 ); bMainSizer->Add( b_buttonsSizer, 0, wxALIGN_CENTER_VERTICAL, 5 ); diff --git a/gerbview/dialogs/dialog_print_using_printer_base.fbp b/gerbview/dialogs/dialog_print_using_printer_base.fbp index 15aa57c9ec..184cdb8564 100644 --- a/gerbview/dialogs/dialog_print_using_printer_base.fbp +++ b/gerbview/dialogs/dialog_print_using_printer_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -20,8 +20,10 @@ . 1 + 1 1 1 + UI 1 0 @@ -807,7 +809,7 @@ none 5 - wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -895,7 +897,7 @@ 5 - wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -983,7 +985,7 @@ 5 - wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -1071,7 +1073,7 @@ 5 - wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND + wxALL|wxEXPAND 0 1 diff --git a/gerbview/dialogs/dialog_print_using_printer_base.h b/gerbview/dialogs/dialog_print_using_printer_base.h index 9f014ed829..f99650c070 100644 --- a/gerbview/dialogs/dialog_print_using_printer_base.h +++ b/gerbview/dialogs/dialog_print_using_printer_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 8 2012) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! diff --git a/pagelayout_editor/dialogs/properties_frame_base.cpp b/pagelayout_editor/dialogs/properties_frame_base.cpp index a6492cfd64..f4075f936c 100644 --- a/pagelayout_editor/dialogs/properties_frame_base.cpp +++ b/pagelayout_editor/dialogs/properties_frame_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 8 2012) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -30,7 +30,7 @@ PANEL_PROPERTIES_BASE::PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, c m_staticTextType->Wrap( -1 ); m_staticTextType->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); - bSizerType->Add( m_staticTextType, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); + bSizerType->Add( m_staticTextType, 0, wxLEFT|wxRIGHT, 5 ); m_textCtrlType = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY ); bSizerType->Add( m_textCtrlType, 0, wxRIGHT|wxLEFT, 5 ); @@ -45,7 +45,7 @@ PANEL_PROPERTIES_BASE::PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, c m_staticTextPageOpt->Wrap( -1 ); m_staticTextPageOpt->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) ); - bSizerPageOpt->Add( m_staticTextPageOpt, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); + bSizerPageOpt->Add( m_staticTextPageOpt, 0, wxLEFT|wxRIGHT, 5 ); wxString m_choicePageOptChoices[] = { _("None"), _("Page 1 only"), _("Not on page 1") }; int m_choicePageOptNChoices = sizeof( m_choicePageOptChoices ) / sizeof( wxString ); @@ -85,13 +85,13 @@ PANEL_PROPERTIES_BASE::PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, c int m_choiceHjustifyNChoices = sizeof( m_choiceHjustifyChoices ) / sizeof( wxString ); m_choiceHjustify = new wxChoice( m_swItemProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceHjustifyNChoices, m_choiceHjustifyChoices, 0 ); m_choiceHjustify->SetSelection( 0 ); - bSizerJustify->Add( m_choiceHjustify, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALL, 5 ); + bSizerJustify->Add( m_choiceHjustify, 0, wxEXPAND|wxALL, 5 ); m_checkBoxBold = new wxCheckBox( m_swItemProperties, wxID_ANY, _("Bold"), wxDefaultPosition, wxDefaultSize, 0 ); bSizerJustify->Add( m_checkBoxBold, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); - bSizerFontOpt->Add( bSizerJustify, 0, wxALIGN_CENTER_VERTICAL, 5 ); + bSizerFontOpt->Add( bSizerJustify, 0, 0, 5 ); wxBoxSizer* bSizerBoldItalic; bSizerBoldItalic = new wxBoxSizer( wxHORIZONTAL ); @@ -104,13 +104,13 @@ PANEL_PROPERTIES_BASE::PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, c int m_choiceVjustifyNChoices = sizeof( m_choiceVjustifyChoices ) / sizeof( wxString ); m_choiceVjustify = new wxChoice( m_swItemProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceVjustifyNChoices, m_choiceVjustifyChoices, 0 ); m_choiceVjustify->SetSelection( 1 ); - bSizerBoldItalic->Add( m_choiceVjustify, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALL, 5 ); + bSizerBoldItalic->Add( m_choiceVjustify, 0, wxEXPAND|wxALL, 5 ); m_checkBoxItalic = new wxCheckBox( m_swItemProperties, wxID_ANY, _("Italic"), wxDefaultPosition, wxDefaultSize, 0 ); bSizerBoldItalic->Add( m_checkBoxItalic, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); - bSizerFontOpt->Add( bSizerBoldItalic, 1, wxALIGN_CENTER_VERTICAL, 5 ); + bSizerFontOpt->Add( bSizerBoldItalic, 1, 0, 5 ); m_SizerTextOptions->Add( bSizerFontOpt, 0, wxEXPAND, 5 ); @@ -191,7 +191,7 @@ PANEL_PROPERTIES_BASE::PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, c m_buttonOK = new wxButton( m_swItemProperties, wxID_ANY, _("Accept"), wxDefaultPosition, wxDefaultSize, 0 ); m_buttonOK->SetDefault(); - bSizerMain->Add( m_buttonOK, 0, wxALIGN_BOTTOM|wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 5 ); + bSizerMain->Add( m_buttonOK, 0, wxALL|wxEXPAND, 5 ); m_staticline8 = new wxStaticLine( m_swItemProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); bSizerMain->Add( m_staticline8, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); @@ -324,7 +324,7 @@ PANEL_PROPERTIES_BASE::PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, c m_staticTextThickness = new wxStaticText( m_swItemProperties, wxID_ANY, _("Thickness"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextThickness->Wrap( -1 ); - bSizerThickness->Add( m_staticTextThickness, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); + bSizerThickness->Add( m_staticTextThickness, 0, wxLEFT|wxRIGHT, 5 ); m_textCtrlThickness = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); bSizerThickness->Add( m_textCtrlThickness, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); diff --git a/pagelayout_editor/dialogs/properties_frame_base.fbp b/pagelayout_editor/dialogs/properties_frame_base.fbp index 7e112d688e..335e750bec 100644 --- a/pagelayout_editor/dialogs/properties_frame_base.fbp +++ b/pagelayout_editor/dialogs/properties_frame_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -20,8 +20,10 @@ . 1 + 1 1 1 + UI 1 0 @@ -243,32 +245,32 @@ - + bSizerMain wxVERTICAL none - + 5 0 - + bSizerButt wxHORIZONTAL none - + 5 0 - + bSizerType wxVERTICAL none 5 - wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL + wxLEFT|wxRIGHT 0 1 @@ -442,18 +444,18 @@ - + 5 0 - + bSizerPageOpt wxVERTICAL none 5 - wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL + wxLEFT|wxRIGHT 0 1 @@ -707,11 +709,11 @@ - + 5 wxEXPAND 0 - + m_SizerTextOptions wxVERTICAL @@ -890,18 +892,18 @@ - + 5 wxEXPAND 0 - + bSizerFontOpt wxVERTICAL none 5 - wxALIGN_CENTER_VERTICAL + 0 @@ -993,7 +995,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALL + wxEXPAND|wxALL 0 1 @@ -1171,7 +1173,7 @@ 5 - wxALIGN_CENTER_VERTICAL + 1 @@ -1263,7 +1265,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALL + wxEXPAND|wxALL 0 1 @@ -1441,20 +1443,20 @@ - + 5 0 - + bSizerTextSize wxHORIZONTAL none - + 5 wxEXPAND 1 - + bSizerTsizeX wxVERTICAL @@ -1635,11 +1637,11 @@ - + 5 wxEXPAND 1 - + bSizerTsizeY wxVERTICAL @@ -1905,20 +1907,20 @@ - + 5 0 - + bSizerConstraints wxHORIZONTAL none - + 5 wxEXPAND 1 - + bSizer42 wxVERTICAL @@ -2099,11 +2101,11 @@ - + 5 wxEXPAND 1 - + bSizer52 wxVERTICAL @@ -2371,7 +2373,7 @@ 5 - wxALIGN_BOTTOM|wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -3967,7 +3969,7 @@ none 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + wxLEFT|wxRIGHT 0 1 @@ -4503,20 +4505,20 @@ - + 5 wxEXPAND 0 - + m_SizerBitmapPPI wxHORIZONTAL protected - + 5 wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL 0 - + 1 1 1 @@ -4595,11 +4597,11 @@ - + 5 wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL 0 - + 1 1 1 @@ -5617,11 +5619,11 @@ - + General Options 0 - + 1 1 1 @@ -5697,16 +5699,16 @@ - + bSizerGeneralOpts wxVERTICAL none - + 5 0 - + bSizerGeneralOpts1 wxVERTICAL @@ -5794,11 +5796,11 @@ - + 5 wxEXPAND 0 - + bSizerDefTextSize wxHORIZONTAL @@ -6175,11 +6177,11 @@ - + 5 wxEXPAND 0 - + bSizerDefLineWidth wxHORIZONTAL @@ -6558,11 +6560,11 @@ - + 5 wxALL|wxEXPAND 0 - + 1 1 1 @@ -6646,11 +6648,11 @@ - + 5 wxEXPAND | wxALL 0 - + 1 1 1 @@ -6727,20 +6729,20 @@ - + 5 0 - + bSizerGeneraMargins wxVERTICAL none - + 5 wxALL 0 - + 1 1 1 @@ -6819,29 +6821,29 @@ - + 5 wxEXPAND 0 - + bSizerDefLRMargins wxHORIZONTAL none - + 5 wxEXPAND 1 - + bSizerDefLeftMargin wxVERTICAL none - + 5 wxTOP|wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -6920,11 +6922,11 @@ - + 5 wxRIGHT|wxLEFT|wxEXPAND 0 - + 1 1 1 @@ -7013,20 +7015,20 @@ - + 5 wxEXPAND 1 - + bSizerDefTsizeY1 wxVERTICAL none - + 5 wxTOP|wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -7105,11 +7107,11 @@ - + 5 wxRIGHT|wxLEFT|wxEXPAND 0 - + 1 1 1 @@ -7200,29 +7202,29 @@ - + 5 wxEXPAND 0 - + bSizerDefTBMargins wxHORIZONTAL none - + 5 1 - + bSizerTopMargin wxVERTICAL none - + 5 wxTOP|wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -7301,11 +7303,11 @@ - + 5 wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND 0 - + 1 1 1 @@ -7394,20 +7396,20 @@ - + 5 1 - + bSizerDefBottomMargin wxVERTICAL none - + 5 wxTOP|wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -7486,11 +7488,11 @@ - + 5 wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND 0 - + 1 1 1 @@ -7583,11 +7585,11 @@ - + 5 wxALL|wxEXPAND 0 - + 1 1 1 diff --git a/pagelayout_editor/dialogs/properties_frame_base.h b/pagelayout_editor/dialogs/properties_frame_base.h index 89d89aa7f6..28ab1f4e23 100644 --- a/pagelayout_editor/dialogs/properties_frame_base.h +++ b/pagelayout_editor/dialogs/properties_frame_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 8 2012) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! diff --git a/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp b/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp index 26ee9e5c8e..d278530daf 100644 --- a/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp +++ b/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -273,7 +273,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_TrackCurrentValue = new wxTextCtrl( m_panelTrackWidth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_TrackCurrentValue->SetMaxLength( 0 ); - fgSizerTWprms->Add( m_TrackCurrentValue, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerTWprms->Add( m_TrackCurrentValue, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); m_staticText62 = new wxStaticText( m_panelTrackWidth, wxID_ANY, _("A"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText62->Wrap( -1 ); @@ -285,7 +285,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_TrackDeltaTValue = new wxTextCtrl( m_panelTrackWidth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_TrackDeltaTValue->SetMaxLength( 0 ); - fgSizerTWprms->Add( m_TrackDeltaTValue, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); + fgSizerTWprms->Add( m_TrackDeltaTValue, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); m_staticText64 = new wxStaticText( m_panelTrackWidth, wxID_ANY, _("deg C"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText64->Wrap( -1 ); @@ -297,12 +297,12 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_TrackThicknessValue = new wxTextCtrl( m_panelTrackWidth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_TrackThicknessValue->SetMaxLength( 0 ); - fgSizerTWprms->Add( m_TrackThicknessValue, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerTWprms->Add( m_TrackThicknessValue, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); wxArrayString m_TW_CuThickness_choiceUnitChoices; m_TW_CuThickness_choiceUnit = new UNIT_SELECTOR_LEN( m_panelTrackWidth, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_TW_CuThickness_choiceUnitChoices, 0 ); m_TW_CuThickness_choiceUnit->SetSelection( 0 ); - fgSizerTWprms->Add( m_TW_CuThickness_choiceUnit, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT, 5 ); + fgSizerTWprms->Add( m_TW_CuThickness_choiceUnit, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); m_staticText66 = new wxStaticText( m_panelTrackWidth, wxID_ANY, _("Conductor length"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText66->Wrap( -1 ); @@ -347,12 +347,12 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_ExtTrackWidthValue = new wxTextCtrl( m_panelTrackWidth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_ExtTrackWidthValue->SetMaxLength( 0 ); - fgSizerTW_Results->Add( m_ExtTrackWidthValue, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); + fgSizerTW_Results->Add( m_ExtTrackWidthValue, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); wxArrayString m_TW_ExtTrackWidth_choiceUnitChoices; m_TW_ExtTrackWidth_choiceUnit = new UNIT_SELECTOR_LEN( m_panelTrackWidth, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_TW_ExtTrackWidth_choiceUnitChoices, 0 ); m_TW_ExtTrackWidth_choiceUnit->SetSelection( 0 ); - fgSizerTW_Results->Add( m_TW_ExtTrackWidth_choiceUnit, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT, 5 ); + fgSizerTW_Results->Add( m_TW_ExtTrackWidth_choiceUnit, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); m_staticTextArea = new wxStaticText( m_panelTrackWidth, wxID_ANY, _("Cross-section area"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextArea->Wrap( -1 ); @@ -360,7 +360,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_ExtTrackAreaValue = new wxTextCtrl( m_panelTrackWidth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_ExtTrackAreaValue->SetMaxLength( 0 ); - fgSizerTW_Results->Add( m_ExtTrackAreaValue, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); + fgSizerTW_Results->Add( m_ExtTrackAreaValue, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); m_ExtTrackAreaUnitLabel = new wxStaticText( m_panelTrackWidth, wxID_ANY, _("mm ^ 2"), wxDefaultPosition, wxDefaultSize, 0 ); m_ExtTrackAreaUnitLabel->Wrap( -1 ); @@ -372,7 +372,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_ExtTrackResistValue = new wxTextCtrl( m_panelTrackWidth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_ExtTrackResistValue->SetMaxLength( 0 ); - fgSizerTW_Results->Add( m_ExtTrackResistValue, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); + fgSizerTW_Results->Add( m_ExtTrackResistValue, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); m_staticText84 = new wxStaticText( m_panelTrackWidth, wxID_ANY, _("Ohm"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText84->Wrap( -1 ); @@ -384,7 +384,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_ExtTrackVDropValue = new wxTextCtrl( m_panelTrackWidth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_ExtTrackVDropValue->SetMaxLength( 0 ); - fgSizerTW_Results->Add( m_ExtTrackVDropValue, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); + fgSizerTW_Results->Add( m_ExtTrackVDropValue, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); m_staticText83 = new wxStaticText( m_panelTrackWidth, wxID_ANY, _("Volt"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText83->Wrap( -1 ); @@ -396,7 +396,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_ExtTrackLossValue = new wxTextCtrl( m_panelTrackWidth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_ExtTrackLossValue->SetMaxLength( 0 ); - fgSizerTW_Results->Add( m_ExtTrackLossValue, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + fgSizerTW_Results->Add( m_ExtTrackLossValue, 0, wxALL|wxEXPAND, 5 ); m_staticText791 = new wxStaticText( m_panelTrackWidth, wxID_ANY, _("Watt"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText791->Wrap( -1 ); @@ -423,12 +423,12 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_IntTrackWidthValue = new wxTextCtrl( m_panelTrackWidth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_IntTrackWidthValue->SetMaxLength( 0 ); - fgSizerTW_Results1->Add( m_IntTrackWidthValue, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); + fgSizerTW_Results1->Add( m_IntTrackWidthValue, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); wxArrayString m_TW_IntTrackWidth_choiceUnitChoices; m_TW_IntTrackWidth_choiceUnit = new UNIT_SELECTOR_LEN( m_panelTrackWidth, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_TW_IntTrackWidth_choiceUnitChoices, 0 ); m_TW_IntTrackWidth_choiceUnit->SetSelection( 0 ); - fgSizerTW_Results1->Add( m_TW_IntTrackWidth_choiceUnit, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT, 5 ); + fgSizerTW_Results1->Add( m_TW_IntTrackWidth_choiceUnit, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); m_staticTextArea1 = new wxStaticText( m_panelTrackWidth, wxID_ANY, _("Cross-section area"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextArea1->Wrap( -1 ); @@ -436,7 +436,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_IntTrackAreaValue = new wxTextCtrl( m_panelTrackWidth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_IntTrackAreaValue->SetMaxLength( 0 ); - fgSizerTW_Results1->Add( m_IntTrackAreaValue, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); + fgSizerTW_Results1->Add( m_IntTrackAreaValue, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); m_IntTrackAreaUnitLabel = new wxStaticText( m_panelTrackWidth, wxID_ANY, _("mm ^ 2"), wxDefaultPosition, wxDefaultSize, 0 ); m_IntTrackAreaUnitLabel->Wrap( -1 ); @@ -448,7 +448,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_IntTrackResistValue = new wxTextCtrl( m_panelTrackWidth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_IntTrackResistValue->SetMaxLength( 0 ); - fgSizerTW_Results1->Add( m_IntTrackResistValue, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); + fgSizerTW_Results1->Add( m_IntTrackResistValue, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); m_staticText841 = new wxStaticText( m_panelTrackWidth, wxID_ANY, _("Ohm"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText841->Wrap( -1 ); @@ -460,7 +460,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_IntTrackVDropValue = new wxTextCtrl( m_panelTrackWidth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_IntTrackVDropValue->SetMaxLength( 0 ); - fgSizerTW_Results1->Add( m_IntTrackVDropValue, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); + fgSizerTW_Results1->Add( m_IntTrackVDropValue, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); m_staticText831 = new wxStaticText( m_panelTrackWidth, wxID_ANY, _("Volt"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText831->Wrap( -1 ); @@ -472,7 +472,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_IntTrackLossValue = new wxTextCtrl( m_panelTrackWidth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_IntTrackLossValue->SetMaxLength( 0 ); - fgSizerTW_Results1->Add( m_IntTrackLossValue, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + fgSizerTW_Results1->Add( m_IntTrackLossValue, 0, wxALL|wxEXPAND, 5 ); m_staticText7911 = new wxStaticText( m_panelTrackWidth, wxID_ANY, _("Watt"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText7911->Wrap( -1 ); @@ -600,7 +600,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow bLeftSizer->Add( m_TranslineSelection, 0, wxTOP|wxRIGHT|wxLEFT|wxEXPAND, 5 ); m_panelDisplayshape = new wxPanel( m_panelTransline, wxID_ANY, wxDefaultPosition, wxSize( 205,205 ), wxTAB_TRAVERSAL ); - bLeftSizer->Add( m_panelDisplayshape, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); + bLeftSizer->Add( m_panelDisplayshape, 1, wxEXPAND, 5 ); bSizeTransline->Add( bLeftSizer, 0, wxEXPAND, 5 ); @@ -626,7 +626,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_Value_EpsilonR = new wxTextCtrl( m_panelTransline, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_Value_EpsilonR->SetMaxLength( 0 ); - fgSizerSubstPrms->Add( m_Value_EpsilonR, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + fgSizerSubstPrms->Add( m_Value_EpsilonR, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); m_button_EpsilonR = new wxButton( m_panelTransline, wxID_ANY, _("..."), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); fgSizerSubstPrms->Add( m_button_EpsilonR, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); @@ -637,7 +637,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_Value_TanD = new wxTextCtrl( m_panelTransline, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_Value_TanD->SetMaxLength( 0 ); - fgSizerSubstPrms->Add( m_Value_TanD, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); + fgSizerSubstPrms->Add( m_Value_TanD, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); m_button_TanD = new wxButton( m_panelTransline, wxID_ANY, _("..."), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); fgSizerSubstPrms->Add( m_button_TanD, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); @@ -650,7 +650,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_Value_Rho = new wxTextCtrl( m_panelTransline, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_Value_Rho->SetMaxLength( 0 ); - fgSizerSubstPrms->Add( m_Value_Rho, 0, wxEXPAND|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerSubstPrms->Add( m_Value_Rho, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); m_button_Rho = new wxButton( m_panelTransline, wxID_ANY, _("..."), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); fgSizerSubstPrms->Add( m_button_Rho, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); @@ -661,7 +661,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_Substrate_prm4_Value = new wxTextCtrl( m_panelTransline, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_Substrate_prm4_Value->SetMaxLength( 0 ); - fgSizerSubstPrms->Add( m_Substrate_prm4_Value, 0, wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerSubstPrms->Add( m_Substrate_prm4_Value, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); wxArrayString m_SubsPrm4_choiceUnitChoices; m_SubsPrm4_choiceUnit = new UNIT_SELECTOR_LEN( m_panelTransline, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_SubsPrm4_choiceUnitChoices, 0 ); @@ -674,7 +674,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_Substrate_prm5_Value = new wxTextCtrl( m_panelTransline, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_Substrate_prm5_Value->SetMaxLength( 0 ); - fgSizerSubstPrms->Add( m_Substrate_prm5_Value, 0, wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerSubstPrms->Add( m_Substrate_prm5_Value, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); wxArrayString m_SubsPrm5_choiceUnitChoices; m_SubsPrm5_choiceUnit = new UNIT_SELECTOR_LEN( m_panelTransline, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_SubsPrm5_choiceUnitChoices, 0 ); @@ -687,7 +687,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_Substrate_prm6_Value = new wxTextCtrl( m_panelTransline, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_Substrate_prm6_Value->SetMaxLength( 0 ); - fgSizerSubstPrms->Add( m_Substrate_prm6_Value, 0, wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerSubstPrms->Add( m_Substrate_prm6_Value, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); wxArrayString m_SubsPrm6_choiceUnitChoices; m_SubsPrm6_choiceUnit = new UNIT_SELECTOR_LEN( m_panelTransline, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_SubsPrm6_choiceUnitChoices, 0 ); @@ -700,7 +700,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_Substrate_prm7_Value = new wxTextCtrl( m_panelTransline, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_Substrate_prm7_Value->SetMaxLength( 0 ); - fgSizerSubstPrms->Add( m_Substrate_prm7_Value, 0, wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerSubstPrms->Add( m_Substrate_prm7_Value, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); wxArrayString m_SubsPrm7_choiceUnitChoices; m_SubsPrm7_choiceUnit = new UNIT_SELECTOR_LEN( m_panelTransline, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_SubsPrm7_choiceUnitChoices, 0 ); @@ -713,7 +713,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_Substrate_prm8_Value = new wxTextCtrl( m_panelTransline, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_Substrate_prm8_Value->SetMaxLength( 0 ); - fgSizerSubstPrms->Add( m_Substrate_prm8_Value, 0, wxEXPAND|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerSubstPrms->Add( m_Substrate_prm8_Value, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); wxArrayString m_SubsPrm8_choiceUnitChoices; m_SubsPrm8_choiceUnit = new UNIT_SELECTOR_LEN( m_panelTransline, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_SubsPrm8_choiceUnitChoices, 0 ); @@ -726,7 +726,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_Substrate_prm9_Value = new wxTextCtrl( m_panelTransline, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_Substrate_prm9_Value->SetMaxLength( 0 ); - fgSizerSubstPrms->Add( m_Substrate_prm9_Value, 0, wxEXPAND|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerSubstPrms->Add( m_Substrate_prm9_Value, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); wxArrayString m_SubsPrm9_choiceUnitChoices; m_SubsPrm9_choiceUnit = new UNIT_SELECTOR_LEN( m_panelTransline, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_SubsPrm9_choiceUnitChoices, 0 ); @@ -754,7 +754,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_Value_Frequency_Ctrl = new wxTextCtrl( m_panelTransline, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_Value_Frequency_Ctrl->SetMaxLength( 0 ); - fgSizeCmpPrms->Add( m_Value_Frequency_Ctrl, 0, wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizeCmpPrms->Add( m_Value_Frequency_Ctrl, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); wxArrayString m_choiceUnit_FrequencyChoices; m_choiceUnit_Frequency = new UNIT_SELECTOR_FREQUENCY( m_panelTransline, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnit_FrequencyChoices, 0 ); @@ -791,12 +791,12 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_Phys_prm1_Value = new wxTextCtrl( m_panelTransline, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_Phys_prm1_Value->SetMaxLength( 0 ); - fgSizerPhysPrms->Add( m_Phys_prm1_Value, 0, wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerPhysPrms->Add( m_Phys_prm1_Value, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); wxArrayString m_choiceUnit_Param1Choices; m_choiceUnit_Param1 = new UNIT_SELECTOR_LEN( m_panelTransline, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnit_Param1Choices, 0 ); m_choiceUnit_Param1->SetSelection( 0 ); - fgSizerPhysPrms->Add( m_choiceUnit_Param1, 0, wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerPhysPrms->Add( m_choiceUnit_Param1, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); m_radioBtnPrm1 = new wxRadioButton( m_panelTransline, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxRB_GROUP ); fgSizerPhysPrms->Add( m_radioBtnPrm1, 0, wxALIGN_CENTER_VERTICAL, 5 ); @@ -807,12 +807,12 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_Phys_prm2_Value = new wxTextCtrl( m_panelTransline, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_Phys_prm2_Value->SetMaxLength( 0 ); - fgSizerPhysPrms->Add( m_Phys_prm2_Value, 0, wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerPhysPrms->Add( m_Phys_prm2_Value, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); wxArrayString m_choiceUnit_Param2Choices; m_choiceUnit_Param2 = new UNIT_SELECTOR_LEN( m_panelTransline, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnit_Param2Choices, 0 ); m_choiceUnit_Param2->SetSelection( 0 ); - fgSizerPhysPrms->Add( m_choiceUnit_Param2, 0, wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerPhysPrms->Add( m_choiceUnit_Param2, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); m_radioBtnPrm2 = new wxRadioButton( m_panelTransline, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerPhysPrms->Add( m_radioBtnPrm2, 0, wxALIGN_CENTER_VERTICAL, 5 ); @@ -823,12 +823,12 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_Phys_prm3_Value = new wxTextCtrl( m_panelTransline, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_Phys_prm3_Value->SetMaxLength( 0 ); - fgSizerPhysPrms->Add( m_Phys_prm3_Value, 0, wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerPhysPrms->Add( m_Phys_prm3_Value, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); wxArrayString m_choiceUnit_Param3Choices; m_choiceUnit_Param3 = new UNIT_SELECTOR_LEN( m_panelTransline, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnit_Param3Choices, 0 ); m_choiceUnit_Param3->SetSelection( 0 ); - fgSizerPhysPrms->Add( m_choiceUnit_Param3, 0, wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerPhysPrms->Add( m_choiceUnit_Param3, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); fgSizerPhysPrms->Add( 0, 0, 0, 0, 5 ); @@ -852,10 +852,10 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow bSizerButtons->Add( m_bitmapAnalyse, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); m_AnalyseButton = new wxButton( m_panelTransline, wxID_ANY, _("Analyze"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizerButtons->Add( m_AnalyseButton, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); + bSizerButtons->Add( m_AnalyseButton, 0, wxEXPAND|wxRIGHT, 5 ); m_SynthetizeButton = new wxButton( m_panelTransline, wxID_ANY, _("Synthetize"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizerButtons->Add( m_SynthetizeButton, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); + bSizerButtons->Add( m_SynthetizeButton, 0, wxEXPAND|wxLEFT, 5 ); m_bitmapSynthetize = new wxStaticBitmap( m_panelTransline, wxID_ANY, wxBitmap( arrow_top_xpm ), wxDefaultPosition, wxDefaultSize, 0 ); bSizerButtons->Add( m_bitmapSynthetize, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); @@ -894,12 +894,12 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_Elec_prm2_Value = new wxTextCtrl( m_panelTransline, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_Elec_prm2_Value->SetMaxLength( 0 ); - fgSizerResults->Add( m_Elec_prm2_Value, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); + fgSizerResults->Add( m_Elec_prm2_Value, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); wxArrayString m_choiceUnit_ElecPrm2Choices; m_choiceUnit_ElecPrm2 = new UNIT_SELECTOR_RESISTOR( m_panelTransline, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnit_ElecPrm2Choices, 0 ); m_choiceUnit_ElecPrm2->SetSelection( 0 ); - fgSizerResults->Add( m_choiceUnit_ElecPrm2, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + fgSizerResults->Add( m_choiceUnit_ElecPrm2, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); m_elec_prm3_label = new wxStaticText( m_panelTransline, wxID_ANY, _("Angle"), wxDefaultPosition, wxDefaultSize, 0 ); m_elec_prm3_label->Wrap( -1 ); @@ -907,7 +907,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_Elec_prm3_Value = new wxTextCtrl( m_panelTransline, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_Elec_prm3_Value->SetMaxLength( 0 ); - fgSizerResults->Add( m_Elec_prm3_Value, 0, wxEXPAND|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerResults->Add( m_Elec_prm3_Value, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); wxArrayString m_choiceUnit_ElecPrm3Choices; m_choiceUnit_ElecPrm3 = new UNIT_SELECTOR_ANGLE( m_panelTransline, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnit_ElecPrm3Choices, 0 ); @@ -935,7 +935,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_Message1 = new wxStaticText( m_panelTransline, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_Message1->Wrap( -1 ); - fgSizerTranslResults->Add( m_Message1, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + fgSizerTranslResults->Add( m_Message1, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); m_left_message2 = new wxStaticText( m_panelTransline, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_left_message2->Wrap( -1 ); @@ -951,7 +951,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_Message3 = new wxStaticText( m_panelTransline, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_Message3->Wrap( -1 ); - fgSizerTranslResults->Add( m_Message3, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + fgSizerTranslResults->Add( m_Message3, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); m_left_message4 = new wxStaticText( m_panelTransline, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_left_message4->Wrap( -1 ); @@ -959,7 +959,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_Message4 = new wxStaticText( m_panelTransline, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_Message4->Wrap( -1 ); - fgSizerTranslResults->Add( m_Message4, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + fgSizerTranslResults->Add( m_Message4, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); m_left_message5 = new wxStaticText( m_panelTransline, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_left_message5->Wrap( -1 ); @@ -967,7 +967,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_Message5 = new wxStaticText( m_panelTransline, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_Message5->Wrap( -1 ); - fgSizerTranslResults->Add( m_Message5, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT|wxEXPAND, 5 ); + fgSizerTranslResults->Add( m_Message5, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); m_left_message6 = new wxStaticText( m_panelTransline, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_left_message6->Wrap( -1 ); @@ -975,7 +975,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_Message6 = new wxStaticText( m_panelTransline, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_Message6->Wrap( -1 ); - fgSizerTranslResults->Add( m_Message6, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT|wxEXPAND, 5 ); + fgSizerTranslResults->Add( m_Message6, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); m_left_message7 = new wxStaticText( m_panelTransline, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_left_message7->Wrap( -1 ); @@ -983,7 +983,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_Message7 = new wxStaticText( m_panelTransline, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_Message7->Wrap( -1 ); - fgSizerTranslResults->Add( m_Message7, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + fgSizerTranslResults->Add( m_Message7, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); sbMessagesSizer->Add( fgSizerTranslResults, 1, wxEXPAND, 5 ); @@ -1076,7 +1076,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow bSizerAttButt = new wxBoxSizer( wxHORIZONTAL ); m_buttonAlcAtt = new wxButton( m_panelAttenuators, wxID_ANY, _("Calculate"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizerAttButt->Add( m_buttonAlcAtt, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 ); + bSizerAttButt->Add( m_buttonAlcAtt, 0, wxALL, 5 ); m_bitmapAnalyse1 = new wxStaticBitmap( m_panelAttenuators, wxID_ANY, wxBitmap( arrow_bottom_xpm ), wxDefaultPosition, wxDefaultSize, 0 ); bSizerAttButt->Add( m_bitmapAnalyse1, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); diff --git a/pcb_calculator/dialogs/pcb_calculator_frame_base.fbp b/pcb_calculator/dialogs/pcb_calculator_frame_base.fbp index 89eb6a490b..a19832957a 100644 --- a/pcb_calculator/dialogs/pcb_calculator_frame_base.fbp +++ b/pcb_calculator/dialogs/pcb_calculator_frame_base.fbp @@ -3543,7 +3543,7 @@ 5 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 0 1 @@ -3800,7 +3800,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 0 1 @@ -4057,7 +4057,7 @@ 5 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 0 1 @@ -4148,7 +4148,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 0 1 @@ -4794,7 +4794,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 0 1 @@ -4885,7 +4885,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 0 1 @@ -5056,7 +5056,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 0 1 @@ -5313,7 +5313,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 0 1 @@ -5570,7 +5570,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 0 1 @@ -5827,7 +5827,7 @@ 5 - wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -6116,7 +6116,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 0 1 @@ -6207,7 +6207,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 0 1 @@ -6378,7 +6378,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 0 1 @@ -6635,7 +6635,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 0 1 @@ -6892,7 +6892,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 0 1 @@ -7149,7 +7149,7 @@ 5 - wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -8362,7 +8362,7 @@ 5 - wxALIGN_CENTER_HORIZONTAL|wxEXPAND + wxEXPAND 1 1 @@ -8645,7 +8645,7 @@ 5 - wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxEXPAND + wxRIGHT|wxLEFT|wxEXPAND 0 1 @@ -8907,7 +8907,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + wxEXPAND|wxRIGHT|wxLEFT 0 1 @@ -9169,7 +9169,7 @@ 5 - wxEXPAND|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL + wxEXPAND|wxRIGHT|wxLEFT 0 1 @@ -9431,7 +9431,7 @@ 5 - wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL + wxRIGHT|wxLEFT|wxEXPAND 0 1 @@ -9693,7 +9693,7 @@ 5 - wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL + wxRIGHT|wxLEFT|wxEXPAND 0 1 @@ -9955,7 +9955,7 @@ 5 - wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL + wxRIGHT|wxLEFT|wxEXPAND 0 1 @@ -10217,7 +10217,7 @@ 5 - wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL + wxRIGHT|wxLEFT|wxEXPAND 0 1 @@ -10479,7 +10479,7 @@ 5 - wxEXPAND|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL + wxEXPAND|wxRIGHT|wxLEFT 0 1 @@ -10741,7 +10741,7 @@ 5 - wxEXPAND|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL + wxEXPAND|wxRIGHT|wxLEFT 0 1 @@ -11035,7 +11035,7 @@ 5 - wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL + wxRIGHT|wxLEFT|wxEXPAND 0 1 @@ -11349,7 +11349,7 @@ 5 - wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL + wxRIGHT|wxLEFT|wxEXPAND 0 1 @@ -11440,7 +11440,7 @@ 5 - wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL + wxRIGHT|wxLEFT|wxEXPAND 0 1 @@ -11699,7 +11699,7 @@ 5 - wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL + wxRIGHT|wxLEFT|wxEXPAND 0 1 @@ -11790,7 +11790,7 @@ 5 - wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL + wxRIGHT|wxLEFT|wxEXPAND 0 1 @@ -12049,7 +12049,7 @@ 5 - wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL + wxRIGHT|wxLEFT|wxEXPAND 0 1 @@ -12140,7 +12140,7 @@ 5 - wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL + wxRIGHT|wxLEFT|wxEXPAND 0 1 @@ -12343,7 +12343,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxRIGHT + wxEXPAND|wxRIGHT 0 1 @@ -12431,7 +12431,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxLEFT + wxEXPAND|wxLEFT 0 1 @@ -12977,7 +12977,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + wxEXPAND|wxRIGHT|wxLEFT 0 1 @@ -13068,7 +13068,7 @@ 5 - wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxEXPAND + wxRIGHT|wxLEFT|wxEXPAND 0 1 @@ -13239,7 +13239,7 @@ 5 - wxEXPAND|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL + wxEXPAND|wxRIGHT|wxLEFT 0 1 @@ -13533,7 +13533,7 @@ 5 - wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxEXPAND + wxRIGHT|wxLEFT|wxEXPAND 0 1 @@ -13865,7 +13865,7 @@ 5 - wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxEXPAND + wxRIGHT|wxLEFT|wxEXPAND 0 1 @@ -14031,7 +14031,7 @@ 5 - wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxEXPAND + wxRIGHT|wxLEFT|wxEXPAND 0 1 @@ -14197,7 +14197,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT|wxEXPAND + wxRIGHT|wxLEFT|wxEXPAND 0 1 @@ -14363,7 +14363,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT|wxEXPAND + wxRIGHT|wxLEFT|wxEXPAND 0 1 @@ -14529,7 +14529,7 @@ 5 - wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxEXPAND + wxRIGHT|wxLEFT|wxEXPAND 0 1 @@ -14697,7 +14697,7 @@ - + wxID_ANY label @@ -14705,11 +14705,11 @@ wxHORIZONTAL none - + 5 wxEXPAND 0 - + bLeftSizerAtt wxVERTICAL @@ -14886,11 +14886,11 @@ - + 5 wxEXPAND 0 - + bMiddleSizerAtt wxVERTICAL @@ -15698,18 +15698,18 @@ - + 5 wxALIGN_CENTER_HORIZONTAL 0 - + bSizerAttButt wxHORIZONTAL none 5 - wxALL|wxALIGN_CENTER_HORIZONTAL + wxALL 0 1 diff --git a/pcb_calculator/dialogs/pcb_calculator_frame_base.h b/pcb_calculator/dialogs/pcb_calculator_frame_base.h index 0562dd33b3..f6dbef0008 100644 --- a/pcb_calculator/dialogs/pcb_calculator_frame_base.h +++ b/pcb_calculator/dialogs/pcb_calculator_frame_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! diff --git a/pcbnew/dialogs/dialog_SVG_print_base.cpp b/pcbnew/dialogs/dialog_SVG_print_base.cpp index c467ff4cc0..d7c5b85a0d 100644 --- a/pcbnew/dialogs/dialog_SVG_print_base.cpp +++ b/pcbnew/dialogs/dialog_SVG_print_base.cpp @@ -106,10 +106,10 @@ DIALOG_SVG_PRINT_base::DIALOG_SVG_PRINT_base( wxWindow* parent, wxWindowID id, c bButtonsSizer->Add( m_rbFileOpt, 0, wxALL, 5 ); m_buttonCreateFile = new wxButton( this, wxID_PRINT_BOARD, _("Plot"), wxDefaultPosition, wxDefaultSize, 0 ); - bButtonsSizer->Add( m_buttonCreateFile, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); + bButtonsSizer->Add( m_buttonCreateFile, 0, wxALL|wxEXPAND, 5 ); m_buttonQuit = new wxButton( this, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 ); - bButtonsSizer->Add( m_buttonQuit, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); + bButtonsSizer->Add( m_buttonQuit, 0, wxALL|wxEXPAND, 5 ); bUpperSizer->Add( bButtonsSizer, 0, wxEXPAND, 5 ); diff --git a/pcbnew/dialogs/dialog_SVG_print_base.fbp b/pcbnew/dialogs/dialog_SVG_print_base.fbp index e51b7c4b27..d9d3c83a5a 100644 --- a/pcbnew/dialogs/dialog_SVG_print_base.fbp +++ b/pcbnew/dialogs/dialog_SVG_print_base.fbp @@ -1062,7 +1062,7 @@ 5 - wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -1150,7 +1150,7 @@ 5 - wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND + wxALL|wxEXPAND 0 1 diff --git a/pcbnew/dialogs/dialog_design_rules_base.cpp b/pcbnew/dialogs/dialog_design_rules_base.cpp index a0a7f61816..8ac93ead7f 100644 --- a/pcbnew/dialogs/dialog_design_rules_base.cpp +++ b/pcbnew/dialogs/dialog_design_rules_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -74,12 +74,12 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID m_addButton = new wxButton( m_panelNetClassesEditor, wxID_ADD_NETCLASS, _("Add"), wxDefaultPosition, wxDefaultSize, 0 ); m_addButton->SetToolTip( _("Add another Net Class") ); - buttonBoxSizer->Add( m_addButton, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxRIGHT|wxLEFT, 5 ); + buttonBoxSizer->Add( m_addButton, 0, wxLEFT|wxRIGHT|wxTOP, 5 ); m_removeButton = new wxButton( m_panelNetClassesEditor, wxID_REMOVE_NETCLASS, _("Remove"), wxDefaultPosition, wxDefaultSize, 0 ); m_removeButton->SetToolTip( _("Remove the currently select Net Class\nThe default Net Class cannot be removed") ); - buttonBoxSizer->Add( m_removeButton, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxRIGHT|wxLEFT, 5 ); + buttonBoxSizer->Add( m_removeButton, 0, wxLEFT|wxRIGHT|wxTOP, 5 ); m_moveUpButton = new wxButton( m_panelNetClassesEditor, wxID_ANY, _("Move Up"), wxDefaultPosition, wxDefaultSize, 0 ); m_moveUpButton->SetToolTip( _("Move the currently selected Net Class up one row") ); @@ -115,22 +115,22 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID m_buttonRightToLeft = new wxButton( m_panelNetClassesEditor, ID_LEFT_TO_RIGHT_COPY, _("<<<"), wxDefaultPosition, wxDefaultSize, 0 ); m_buttonRightToLeft->SetToolTip( _("Move the selected nets in the right list to the left list") ); - bmiddleSizerNetSelect->Add( m_buttonRightToLeft, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 ); + bmiddleSizerNetSelect->Add( m_buttonRightToLeft, 0, wxALL, 5 ); m_buttonLeftToRight = new wxButton( m_panelNetClassesEditor, ID_RIGHT_TO_LEFT_COPY, _(">>>"), wxDefaultPosition, wxDefaultSize, 0 ); m_buttonLeftToRight->SetToolTip( _("Move the selected nets in the left list to the right list") ); - bmiddleSizerNetSelect->Add( m_buttonLeftToRight, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 ); + bmiddleSizerNetSelect->Add( m_buttonLeftToRight, 0, wxALL, 5 ); m_buttonLeftSelAll = new wxButton( m_panelNetClassesEditor, wxID_ANY, _("<< Select All"), wxDefaultPosition, wxDefaultSize, 0 ); m_buttonLeftSelAll->SetToolTip( _("Select all nets in the left list") ); - bmiddleSizerNetSelect->Add( m_buttonLeftSelAll, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 ); + bmiddleSizerNetSelect->Add( m_buttonLeftSelAll, 0, wxALL, 5 ); m_buttonRightSelAll = new wxButton( m_panelNetClassesEditor, wxID_ANY, _("Select All >>"), wxDefaultPosition, wxDefaultSize, 0 ); m_buttonRightSelAll->SetToolTip( _("Select all nets in the right list") ); - bmiddleSizerNetSelect->Add( m_buttonRightSelAll, 0, wxALIGN_BOTTOM|wxALL|wxALIGN_CENTER_HORIZONTAL, 5 ); + bmiddleSizerNetSelect->Add( m_buttonRightSelAll, 0, wxALIGN_BOTTOM|wxALL, 5 ); sbSizerNetSelectMain->Add( bmiddleSizerNetSelect, 0, wxALIGN_CENTER_VERTICAL, 5 ); @@ -184,7 +184,7 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID sbViasOptionSizer->Add( m_AllowMicroViaCtrl, 0, wxALL|wxEXPAND, 5 ); - bDesignRulesUpperSizer->Add( sbViasOptionSizer, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT|wxEXPAND, 5 ); + bDesignRulesUpperSizer->Add( sbViasOptionSizer, 1, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); wxStaticBoxSizer* sbMinSizesSizer; sbMinSizesSizer = new wxStaticBoxSizer( new wxStaticBox( m_panelGolbalDesignRules, wxID_ANY, _("Minimum Allowed Values:") ), wxVERTICAL ); @@ -302,7 +302,7 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID sViaSizeBox->Add( m_gridViaSizeList, 1, wxALL|wxEXPAND, 5 ); - bDesignRulesLowerSizer->Add( sViaSizeBox, 1, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 5 ); + bDesignRulesLowerSizer->Add( sViaSizeBox, 1, wxALL|wxEXPAND, 5 ); wxStaticBoxSizer* sbTracksListSizer; sbTracksListSizer = new wxStaticBoxSizer( new wxStaticBox( m_panelGolbalDesignRules, wxID_ANY, _("Custom Track Widths:") ), wxVERTICAL ); @@ -351,10 +351,10 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID sbTracksListSizer->Add( m_gridTrackWidthList, 1, wxALL|wxEXPAND, 5 ); - bDesignRulesLowerSizer->Add( sbTracksListSizer, 1, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + bDesignRulesLowerSizer->Add( sbTracksListSizer, 1, wxALL|wxEXPAND, 5 ); - bpanelGlobRulesSizer->Add( bDesignRulesLowerSizer, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); + bpanelGlobRulesSizer->Add( bDesignRulesLowerSizer, 0, wxEXPAND, 5 ); m_panelGolbalDesignRules->SetSizer( bpanelGlobRulesSizer ); diff --git a/pcbnew/dialogs/dialog_design_rules_base.fbp b/pcbnew/dialogs/dialog_design_rules_base.fbp index 69b2143f6c..e6ea11f1d9 100644 --- a/pcbnew/dialogs/dialog_design_rules_base.fbp +++ b/pcbnew/dialogs/dialog_design_rules_base.fbp @@ -424,7 +424,7 @@ none 5 - wxALIGN_CENTER_HORIZONTAL|wxTOP|wxRIGHT|wxLEFT + wxLEFT|wxRIGHT|wxTOP 0 1 @@ -512,7 +512,7 @@ 5 - wxALIGN_CENTER_HORIZONTAL|wxTOP|wxRIGHT|wxLEFT + wxLEFT|wxRIGHT|wxTOP 0 1 @@ -913,14 +913,14 @@ 5 wxALIGN_CENTER_VERTICAL 0 - + bmiddleSizerNetSelect wxVERTICAL none 5 - wxALL|wxALIGN_CENTER_HORIZONTAL + wxALL 0 1 @@ -1008,7 +1008,7 @@ 5 - wxALL|wxALIGN_CENTER_HORIZONTAL + wxALL 0 1 @@ -1096,7 +1096,7 @@ 5 - wxALL|wxALIGN_CENTER_HORIZONTAL + wxALL 0 1 @@ -1184,7 +1184,7 @@ 5 - wxALIGN_BOTTOM|wxALL|wxALIGN_CENTER_HORIZONTAL + wxALIGN_BOTTOM|wxALL 0 1 @@ -1578,9 +1578,9 @@ none 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT|wxEXPAND + wxEXPAND|wxLEFT|wxRIGHT|wxTOP 1 - + wxID_ANY Via Options: @@ -1588,11 +1588,11 @@ wxVERTICAL none - + 5 wxALL|wxEXPAND 0 - + 1 1 1 @@ -1678,11 +1678,11 @@ - + 5 wxALL|wxEXPAND 0 - + 1 1 1 @@ -2840,7 +2840,7 @@ 5 - wxALIGN_CENTER_HORIZONTAL|wxEXPAND + wxEXPAND 0 @@ -2849,7 +2849,7 @@ none 5 - wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND + wxALL|wxEXPAND 1 wxID_ANY @@ -3089,7 +3089,7 @@ 5 - wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL + wxALL|wxEXPAND 1 wxID_ANY diff --git a/pcbnew/dialogs/dialog_design_rules_base.h b/pcbnew/dialogs/dialog_design_rules_base.h index d9565ba41b..891d390014 100644 --- a/pcbnew/dialogs/dialog_design_rules_base.h +++ b/pcbnew/dialogs/dialog_design_rules_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! diff --git a/pcbnew/dialogs/dialog_drc_base.cpp b/pcbnew/dialogs/dialog_drc_base.cpp index 0bbad3ce9c..5d073accc3 100644 --- a/pcbnew/dialogs/dialog_drc_base.cpp +++ b/pcbnew/dialogs/dialog_drc_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 6 2013) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -41,7 +41,7 @@ DIALOG_DRC_CONTROL_BASE::DIALOG_DRC_CONTROL_BASE( wxWindow* parent, wxWindowID i m_SetClearance->SetMaxLength( 0 ); m_SetClearance->Enable( false ); - fgMinValuesSizer->Add( m_SetClearance, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); + fgMinValuesSizer->Add( m_SetClearance, 0, wxALL|wxEXPAND, 5 ); m_TrackMinWidthTitle = new wxStaticText( this, wxID_ANY, _("Min track width"), wxDefaultPosition, wxDefaultSize, 0 ); m_TrackMinWidthTitle->Wrap( -1 ); @@ -61,7 +61,7 @@ DIALOG_DRC_CONTROL_BASE::DIALOG_DRC_CONTROL_BASE( wxWindow* parent, wxWindowID i m_SetViaMinSizeCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_SetViaMinSizeCtrl->SetMaxLength( 0 ); - fgMinValuesSizer->Add( m_SetViaMinSizeCtrl, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); + fgMinValuesSizer->Add( m_SetViaMinSizeCtrl, 0, wxALL|wxEXPAND, 5 ); m_MicroViaMinTitle = new wxStaticText( this, wxID_ANY, _("Min uVia size"), wxDefaultPosition, wxDefaultSize, 0 ); m_MicroViaMinTitle->Wrap( -1 ); @@ -89,10 +89,10 @@ DIALOG_DRC_CONTROL_BASE::DIALOG_DRC_CONTROL_BASE( wxWindow* parent, wxWindowID i m_RptFilenameCtrl->SetToolTip( _("Enter the report filename") ); m_RptFilenameCtrl->SetMinSize( wxSize( 180,-1 ) ); - ReportFileSizer->Add( m_RptFilenameCtrl, 1, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + ReportFileSizer->Add( m_RptFilenameCtrl, 1, wxALL|wxEXPAND, 5 ); m_BrowseButton = new wxButton( this, ID_BUTTON_BROWSE_RPT_FILE, _("..."), wxDefaultPosition, wxSize( 50,-1 ), 0 ); - ReportFileSizer->Add( m_BrowseButton, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); + ReportFileSizer->Add( m_BrowseButton, 0, wxALIGN_CENTER_VERTICAL, 5 ); bSizer7->Add( ReportFileSizer, 0, wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT, 5 ); @@ -125,22 +125,22 @@ DIALOG_DRC_CONTROL_BASE::DIALOG_DRC_CONTROL_BASE( wxWindow* parent, wxWindowID i m_buttonRunDRC->SetDefault(); m_buttonRunDRC->SetToolTip( _("Start the Design Rule Checker") ); - bSizer11->Add( m_buttonRunDRC, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 5 ); + bSizer11->Add( m_buttonRunDRC, 0, wxALL|wxEXPAND, 5 ); m_buttonListUnconnected = new wxButton( this, ID_LIST_UNCONNECTED, _("List Unconnected"), wxDefaultPosition, wxDefaultSize, 0 ); m_buttonListUnconnected->SetToolTip( _("List unconnected pads or tracks") ); - bSizer11->Add( m_buttonListUnconnected, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 5 ); + bSizer11->Add( m_buttonListUnconnected, 0, wxALL|wxEXPAND, 5 ); m_DeleteAllButton = new wxButton( this, ID_DELETE_ALL, _("Delete All Markers"), wxDefaultPosition, wxDefaultSize, 0 ); m_DeleteAllButton->SetToolTip( _("Delete every marker") ); - bSizer11->Add( m_DeleteAllButton, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 5 ); + bSizer11->Add( m_DeleteAllButton, 0, wxALL|wxEXPAND, 5 ); m_DeleteCurrentMarkerButton = new wxButton( this, wxID_ANY, _("Delete Current Marker"), wxDefaultPosition, wxDefaultSize, 0 ); m_DeleteCurrentMarkerButton->SetToolTip( _("Delete the marker selected in the list box below") ); - bSizer11->Add( m_DeleteCurrentMarkerButton, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxALL, 5 ); + bSizer11->Add( m_DeleteCurrentMarkerButton, 0, wxEXPAND|wxALL, 5 ); m_CommandSizer->Add( bSizer11, 0, wxALIGN_CENTER_VERTICAL, 5 ); diff --git a/pcbnew/dialogs/dialog_drc_base.fbp b/pcbnew/dialogs/dialog_drc_base.fbp index 567c8e7985..2e1b037bfd 100644 --- a/pcbnew/dialogs/dialog_drc_base.fbp +++ b/pcbnew/dialogs/dialog_drc_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -118,7 +118,7 @@ 5 wxEXPAND 1 - + bSizer7 wxVERTICAL @@ -224,7 +224,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -572,7 +572,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -939,7 +939,7 @@ 5 - wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL + wxALL|wxEXPAND 1 1 @@ -1030,7 +1030,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT + wxALIGN_CENTER_VERTICAL 0 1 @@ -1318,7 +1318,7 @@ none 5 - wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -1406,7 +1406,7 @@ 5 - wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -1494,7 +1494,7 @@ 5 - wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -1582,7 +1582,7 @@ 5 - wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxALL + wxEXPAND|wxALL 0 1 diff --git a/pcbnew/dialogs/dialog_drc_base.h b/pcbnew/dialogs/dialog_drc_base.h index e86e117322..f38e48ea42 100644 --- a/pcbnew/dialogs/dialog_drc_base.h +++ b/pcbnew/dialogs/dialog_drc_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 6 2013) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! diff --git a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp index 4b3f05d670..3a6021b7ce 100644 --- a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp +++ b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -93,7 +93,7 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare m_ModPositionX = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_ModPositionX->SetMaxLength( 0 ); - fgSizerPos->Add( m_ModPositionX, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT, 5 ); + fgSizerPos->Add( m_ModPositionX, 1, wxEXPAND|wxRIGHT, 5 ); m_XPosUnit = new wxStaticText( m_PanelProperties, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_XPosUnit->Wrap( -1 ); @@ -105,7 +105,7 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare m_ModPositionY = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_ModPositionY->SetMaxLength( 0 ); - fgSizerPos->Add( m_ModPositionY, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT, 5 ); + fgSizerPos->Add( m_ModPositionY, 1, wxEXPAND|wxRIGHT, 5 ); m_YPosUnit = new wxStaticText( m_PanelProperties, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_YPosUnit->Wrap( -1 ); @@ -129,10 +129,10 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare m_PropRightSizer = new wxBoxSizer( wxVERTICAL ); m_buttonExchange = new wxButton( m_PanelProperties, ID_MODULE_PROPERTIES_EXCHANGE, _("Change Footprint(s)"), wxDefaultPosition, wxDefaultSize, 0 ); - m_PropRightSizer->Add( m_buttonExchange, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); + m_PropRightSizer->Add( m_buttonExchange, 0, wxALL|wxEXPAND, 5 ); m_buttonModuleEditor = new wxButton( m_PanelProperties, ID_GOTO_MODULE_EDITOR, _("Footprint Editor"), wxDefaultPosition, wxDefaultSize, 0 ); - m_PropRightSizer->Add( m_buttonModuleEditor, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); + m_PropRightSizer->Add( m_buttonModuleEditor, 0, wxALL|wxEXPAND, 5 ); wxBoxSizer* bSizerAttrib; bSizerAttrib = new wxBoxSizer( wxHORIZONTAL ); @@ -201,10 +201,10 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare int m_ZoneConnectionChoiceNChoices = sizeof( m_ZoneConnectionChoiceChoices ) / sizeof( wxString ); m_ZoneConnectionChoice = new wxChoice( m_PanelProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_ZoneConnectionChoiceNChoices, m_ZoneConnectionChoiceChoices, 0 ); m_ZoneConnectionChoice->SetSelection( 0 ); - bSizer10->Add( m_ZoneConnectionChoice, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); + bSizer10->Add( m_ZoneConnectionChoice, 1, wxALL|wxEXPAND, 5 ); - bSizer11->Add( bSizer10, 1, wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 ); + bSizer11->Add( bSizer10, 1, wxEXPAND, 5 ); m_staticTextInfo = new wxStaticText( m_PanelProperties, wxID_ANY, _("Set clearances to 0 to use global values"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextInfo->Wrap( -1 ); @@ -229,7 +229,7 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare m_NetClearanceValueCtrl = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_NetClearanceValueCtrl->SetMaxLength( 0 ); - fgSizerClearances->Add( m_NetClearanceValueCtrl, 1, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + fgSizerClearances->Add( m_NetClearanceValueCtrl, 1, wxALL|wxEXPAND, 5 ); m_NetClearanceUnits = new wxStaticText( m_PanelProperties, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_NetClearanceUnits->Wrap( -1 ); @@ -252,7 +252,7 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare m_SolderMaskMarginCtrl = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_SolderMaskMarginCtrl->SetMaxLength( 0 ); - fgSizerClearances->Add( m_SolderMaskMarginCtrl, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); + fgSizerClearances->Add( m_SolderMaskMarginCtrl, 1, wxALL|wxEXPAND, 5 ); m_SolderMaskMarginUnits = new wxStaticText( m_PanelProperties, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_SolderMaskMarginUnits->Wrap( -1 ); @@ -280,7 +280,7 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare m_SolderPasteMarginRatioCtrl = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_SolderPasteMarginRatioCtrl->SetMaxLength( 0 ); - fgSizerClearances->Add( m_SolderPasteMarginRatioCtrl, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); + fgSizerClearances->Add( m_SolderPasteMarginRatioCtrl, 1, wxALL|wxEXPAND, 5 ); m_SolderPasteRatioMarginUnits = new wxStaticText( m_PanelProperties, wxID_ANY, _("%"), wxDefaultPosition, wxDefaultSize, 0 ); m_SolderPasteRatioMarginUnits->Wrap( -1 ); @@ -357,10 +357,10 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare bSizer3DButtons = new wxBoxSizer( wxVERTICAL ); m_buttonAdd = new wxButton( m_Panel3D, ID_ADD_3D_SHAPE, _("Add 3D Shape"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer3DButtons->Add( m_buttonAdd, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); + bSizer3DButtons->Add( m_buttonAdd, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); m_buttonRemove = new wxButton( m_Panel3D, ID_REMOVE_3D_SHAPE, _("Remove 3D Shape"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer3DButtons->Add( m_buttonRemove, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); + bSizer3DButtons->Add( m_buttonRemove, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); m_buttonEdit = new wxButton( m_Panel3D, wxID_ANY, _("Edit Filename"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer3DButtons->Add( m_buttonEdit, 0, wxALL|wxEXPAND, 5 ); @@ -386,7 +386,7 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare m_sdbSizerStdButtons->AddButton( m_sdbSizerStdButtonsCancel ); m_sdbSizerStdButtons->Realize(); - m_GeneralBoxSizer->Add( m_sdbSizerStdButtons, 0, wxEXPAND|wxALIGN_RIGHT|wxALL, 5 ); + m_GeneralBoxSizer->Add( m_sdbSizerStdButtons, 0, wxALL|wxEXPAND, 5 ); this->SetSizer( m_GeneralBoxSizer ); diff --git a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.fbp b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.fbp index 907aed27e5..f58bf1e191 100644 --- a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.fbp +++ b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.fbp @@ -175,11 +175,11 @@ - + Properties 1 - + 1 1 1 @@ -253,7 +253,7 @@ - + m_PanelPropertiesBoxSizer wxHORIZONTAL @@ -1351,7 +1351,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT + wxEXPAND|wxRIGHT 1 1 @@ -1608,7 +1608,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT + wxEXPAND|wxRIGHT 1 1 @@ -1958,18 +1958,18 @@ - + 5 0 - + m_PropRightSizer wxVERTICAL private 5 - wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -2057,7 +2057,7 @@ 5 - wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -2143,11 +2143,11 @@ - + 5 wxEXPAND 0 - + bSizerAttrib wxHORIZONTAL @@ -2334,11 +2334,11 @@ - + 5 wxEXPAND|wxALL 0 - + wxID_ANY Auto Place @@ -2752,11 +2752,11 @@ - + 5 wxALL|wxEXPAND 0 - + wxID_ANY Local Settings @@ -2764,18 +2764,18 @@ wxVERTICAL none - + 5 wxEXPAND 0 - + bSizer11 wxVERTICAL none 5 - wxEXPAND|wxALIGN_CENTER_HORIZONTAL + wxEXPAND 1 @@ -2867,7 +2867,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + wxALL|wxEXPAND 1 1 @@ -3040,11 +3040,11 @@ - + 5 wxEXPAND 1 - + 3 wxBOTH 1 @@ -3141,7 +3141,7 @@ 5 - wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND + wxALL|wxEXPAND 1 1 @@ -3641,7 +3641,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + wxALL|wxEXPAND 1 1 @@ -4155,7 +4155,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + wxALL|wxEXPAND 1 1 @@ -4590,11 +4590,11 @@ - + 5 wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -4673,11 +4673,11 @@ - + 5 wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND 0 - + 1 1 1 @@ -5080,7 +5080,7 @@ none 5 - wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT + wxEXPAND|wxLEFT|wxRIGHT|wxTOP 0 1 @@ -5168,7 +5168,7 @@ 5 - wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT + wxEXPAND|wxLEFT|wxRIGHT|wxTOP 0 1 @@ -5254,11 +5254,11 @@ - + 5 wxALL|wxEXPAND 0 - + 1 1 1 @@ -5353,7 +5353,7 @@ 5 - wxEXPAND|wxALIGN_RIGHT|wxALL + wxALL|wxEXPAND 0 0 diff --git a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.h b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.h index 98d3075873..f9e7aa9fb3 100644 --- a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.h +++ b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! diff --git a/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp b/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp index 2256d65a6a..535a6876f4 100644 --- a/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp +++ b/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -291,10 +291,10 @@ DIALOG_MODULE_MODULE_EDITOR_BASE::DIALOG_MODULE_MODULE_EDITOR_BASE( wxWindow* pa bSizer3DButtons = new wxBoxSizer( wxVERTICAL ); m_buttonBrowse = new wxButton( m_Panel3D, ID_BROWSE_3D_LIB, _("Add 3D Shape"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer3DButtons->Add( m_buttonBrowse, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); + bSizer3DButtons->Add( m_buttonBrowse, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); m_buttonRemove = new wxButton( m_Panel3D, ID_REMOVE_3D_SHAPE, _("Remove 3D Shape"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer3DButtons->Add( m_buttonRemove, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); + bSizer3DButtons->Add( m_buttonRemove, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); m_buttonEdit = new wxButton( m_Panel3D, wxID_ANY, _("Edit Filename"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer3DButtons->Add( m_buttonEdit, 0, wxALL|wxEXPAND, 5 ); @@ -320,7 +320,7 @@ DIALOG_MODULE_MODULE_EDITOR_BASE::DIALOG_MODULE_MODULE_EDITOR_BASE( wxWindow* pa m_sdbSizerStdButtons->AddButton( m_sdbSizerStdButtonsCancel ); m_sdbSizerStdButtons->Realize(); - m_GeneralBoxSizer->Add( m_sdbSizerStdButtons, 0, wxEXPAND|wxALIGN_RIGHT|wxALL, 5 ); + m_GeneralBoxSizer->Add( m_sdbSizerStdButtons, 0, wxEXPAND|wxALL, 5 ); this->SetSizer( m_GeneralBoxSizer ); diff --git a/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.fbp b/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.fbp index 2722bffc4f..8757782efb 100644 --- a/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.fbp +++ b/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.fbp @@ -4113,7 +4113,7 @@ none 5 - wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 0 1 @@ -4201,7 +4201,7 @@ 5 - wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 0 1 @@ -4386,7 +4386,7 @@ 5 - wxEXPAND|wxALIGN_RIGHT|wxALL + wxEXPAND|wxALL 0 0 diff --git a/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.h b/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.h index e4057ea805..180f059a61 100644 --- a/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.h +++ b/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! diff --git a/pcbnew/dialogs/dialog_enum_pads_base.cpp b/pcbnew/dialogs/dialog_enum_pads_base.cpp index 58a724210c..9d651e2a63 100644 --- a/pcbnew/dialogs/dialog_enum_pads_base.cpp +++ b/pcbnew/dialogs/dialog_enum_pads_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -35,7 +35,7 @@ DIALOG_ENUM_PADS_BASE::DIALOG_ENUM_PADS_BASE( wxWindow* parent, wxWindowID id, c m_padPrefix = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_padPrefix->SetMaxLength( 4 ); - fgSizer->Add( m_padPrefix, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizer->Add( m_padPrefix, 0, wxALL|wxEXPAND, 5 ); m_lblPadStartNum = new wxStaticText( this, wxID_ANY, _("First pad number:"), wxDefaultPosition, wxDefaultSize, 0 ); m_lblPadStartNum->Wrap( -1 ); diff --git a/pcbnew/dialogs/dialog_enum_pads_base.fbp b/pcbnew/dialogs/dialog_enum_pads_base.fbp index 3c5c7515f6..9816e700f5 100644 --- a/pcbnew/dialogs/dialog_enum_pads_base.fbp +++ b/pcbnew/dialogs/dialog_enum_pads_base.fbp @@ -287,7 +287,7 @@ 5 - wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL + wxALL|wxEXPAND 0 1 diff --git a/pcbnew/dialogs/dialog_enum_pads_base.h b/pcbnew/dialogs/dialog_enum_pads_base.h index 1e60111b9b..5600a66569 100644 --- a/pcbnew/dialogs/dialog_enum_pads_base.h +++ b/pcbnew/dialogs/dialog_enum_pads_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! diff --git a/pcbnew/dialogs/dialog_fp_lib_table_base.fbp b/pcbnew/dialogs/dialog_fp_lib_table_base.fbp index 32d1a98fc4..94152fa23d 100644 --- a/pcbnew/dialogs/dialog_fp_lib_table_base.fbp +++ b/pcbnew/dialogs/dialog_fp_lib_table_base.fbp @@ -44,7 +44,7 @@ DIALOG_FP_LIB_TABLE_BASE - 634,600 + 717,600 wxCAPTION|wxCLOSE_BOX|wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER|wxSYSTEM_MENU DIALOG_SHIM; dialog_shim.h PCB Library Tables diff --git a/pcbnew/dialogs/dialog_fp_lib_table_base.h b/pcbnew/dialogs/dialog_fp_lib_table_base.h index 0ba7e63a68..b2e4932aa4 100644 --- a/pcbnew/dialogs/dialog_fp_lib_table_base.h +++ b/pcbnew/dialogs/dialog_fp_lib_table_base.h @@ -78,7 +78,7 @@ class DIALOG_FP_LIB_TABLE_BASE : public DIALOG_SHIM public: - DIALOG_FP_LIB_TABLE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("PCB Library Tables"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 634,600 ), long style = wxCAPTION|wxCLOSE_BOX|wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER|wxSYSTEM_MENU ); + DIALOG_FP_LIB_TABLE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("PCB Library Tables"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 717,600 ), long style = wxCAPTION|wxCLOSE_BOX|wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER|wxSYSTEM_MENU ); ~DIALOG_FP_LIB_TABLE_BASE(); }; diff --git a/pcbnew/dialogs/dialog_fp_plugin_options_base.cpp b/pcbnew/dialogs/dialog_fp_plugin_options_base.cpp index 2cd0e86e96..825d971e0c 100644 --- a/pcbnew/dialogs/dialog_fp_plugin_options_base.cpp +++ b/pcbnew/dialogs/dialog_fp_plugin_options_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 6 2013) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -96,7 +96,7 @@ DIALOG_FP_PLUGIN_OPTIONS_BASE::DIALOG_FP_PLUGIN_OPTIONS_BASE( wxWindow* parent, m_options_sizer->Add( m_listbox, 2, wxALL|wxEXPAND, 5 ); m_append_choice_button = new wxButton( this, wxID_ANY, _("<< Append Selected Option"), wxDefaultPosition, wxDefaultSize, 0 ); - m_options_sizer->Add( m_append_choice_button, 0, wxALIGN_CENTER|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); + m_options_sizer->Add( m_append_choice_button, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); m_staticText1 = new wxStaticText( this, wxID_ANY, _("Option Specific Help:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText1->Wrap( -1 ); @@ -125,7 +125,6 @@ DIALOG_FP_PLUGIN_OPTIONS_BASE::DIALOG_FP_PLUGIN_OPTIONS_BASE( wxWindow* parent, this->SetSizer( bSizer4 ); this->Layout(); - bSizer4->Fit( this ); this->Centre( wxBOTH ); diff --git a/pcbnew/dialogs/dialog_fp_plugin_options_base.fbp b/pcbnew/dialogs/dialog_fp_plugin_options_base.fbp index d68086a08c..afa19342e0 100644 --- a/pcbnew/dialogs/dialog_fp_plugin_options_base.fbp +++ b/pcbnew/dialogs/dialog_fp_plugin_options_base.fbp @@ -738,7 +738,7 @@ 5 - wxALIGN_CENTER|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT 0 1 diff --git a/pcbnew/dialogs/dialog_fp_plugin_options_base.h b/pcbnew/dialogs/dialog_fp_plugin_options_base.h index 1cf55510c0..659cc75e57 100644 --- a/pcbnew/dialogs/dialog_fp_plugin_options_base.h +++ b/pcbnew/dialogs/dialog_fp_plugin_options_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 6 2013) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -67,7 +67,7 @@ class DIALOG_FP_PLUGIN_OPTIONS_BASE : public DIALOG_SHIM public: - DIALOG_FP_PLUGIN_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxCAPTION|wxCLOSE_BOX|wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER ); + DIALOG_FP_PLUGIN_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 678,342 ), long style = wxCAPTION|wxCLOSE_BOX|wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER ); ~DIALOG_FP_PLUGIN_OPTIONS_BASE(); }; diff --git a/pcbnew/dialogs/dialog_freeroute_exchange_base.cpp b/pcbnew/dialogs/dialog_freeroute_exchange_base.cpp index 3f5d891c29..1d0f7db859 100644 --- a/pcbnew/dialogs/dialog_freeroute_exchange_base.cpp +++ b/pcbnew/dialogs/dialog_freeroute_exchange_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -59,7 +59,7 @@ DIALOG_FREEROUTE_BASE::DIALOG_FREEROUTE_BASE( wxWindow* parent, wxWindowID id, c bLeftSizer->Add( bLeftSubSizerSizer, 1, wxALL|wxEXPAND, 5 ); - bUpperSizer->Add( bLeftSizer, 1, wxALIGN_TOP|wxALL|wxEXPAND, 5 ); + bUpperSizer->Add( bLeftSizer, 1, wxALL|wxEXPAND, 5 ); bMainSizer->Add( bUpperSizer, 1, wxEXPAND, 5 ); diff --git a/pcbnew/dialogs/dialog_freeroute_exchange_base.fbp b/pcbnew/dialogs/dialog_freeroute_exchange_base.fbp index 4665759bc3..77659f1f2b 100644 --- a/pcbnew/dialogs/dialog_freeroute_exchange_base.fbp +++ b/pcbnew/dialogs/dialog_freeroute_exchange_base.fbp @@ -104,7 +104,7 @@ none 5 - wxALIGN_TOP|wxALL|wxEXPAND + wxALL|wxEXPAND 1 diff --git a/pcbnew/dialogs/dialog_freeroute_exchange_base.h b/pcbnew/dialogs/dialog_freeroute_exchange_base.h index 365d524f32..867db8e5c6 100644 --- a/pcbnew/dialogs/dialog_freeroute_exchange_base.h +++ b/pcbnew/dialogs/dialog_freeroute_exchange_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! diff --git a/pcbnew/dialogs/dialog_gen_module_position_file_base.cpp b/pcbnew/dialogs/dialog_gen_module_position_file_base.cpp index ad4668ee38..b9a7f29779 100644 --- a/pcbnew/dialogs/dialog_gen_module_position_file_base.cpp +++ b/pcbnew/dialogs/dialog_gen_module_position_file_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -32,7 +32,7 @@ DIALOG_GEN_MODULE_POSITION_BASE::DIALOG_GEN_MODULE_POSITION_BASE( wxWindow* pare m_outputDirectoryName->SetToolTip( _("Target directory for plot files. Can be absolute or relative to the board file location.") ); m_outputDirectoryName->SetMinSize( wxSize( 350,-1 ) ); - bSizerdirBrowse->Add( m_outputDirectoryName, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 ); + bSizerdirBrowse->Add( m_outputDirectoryName, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 ); m_browseButton = new wxButton( this, wxID_ANY, _("Browse..."), wxDefaultPosition, wxDefaultSize, 0 ); bSizerdirBrowse->Add( m_browseButton, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); @@ -92,7 +92,7 @@ DIALOG_GEN_MODULE_POSITION_BASE::DIALOG_GEN_MODULE_POSITION_BASE( wxWindow* pare m_sdbSizerButtons->AddButton( m_sdbSizerButtonsCancel ); m_sdbSizerButtons->Realize(); - m_MainSizer->Add( m_sdbSizerButtons, 0, wxEXPAND|wxALIGN_RIGHT|wxTOP|wxBOTTOM|wxRIGHT, 5 ); + m_MainSizer->Add( m_sdbSizerButtons, 0, wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT, 5 ); this->SetSizer( m_MainSizer ); diff --git a/pcbnew/dialogs/dialog_gen_module_position_file_base.fbp b/pcbnew/dialogs/dialog_gen_module_position_file_base.fbp index d5110218b0..603359af37 100644 --- a/pcbnew/dialogs/dialog_gen_module_position_file_base.fbp +++ b/pcbnew/dialogs/dialog_gen_module_position_file_base.fbp @@ -205,7 +205,7 @@ none 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT + wxEXPAND|wxRIGHT|wxLEFT 1 1 @@ -776,7 +776,7 @@ 5 - wxEXPAND|wxALIGN_RIGHT|wxTOP|wxBOTTOM|wxRIGHT + wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT 0 0 diff --git a/pcbnew/dialogs/dialog_gen_module_position_file_base.h b/pcbnew/dialogs/dialog_gen_module_position_file_base.h index 5207316ed3..b00598c4bc 100644 --- a/pcbnew/dialogs/dialog_gen_module_position_file_base.h +++ b/pcbnew/dialogs/dialog_gen_module_position_file_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! diff --git a/pcbnew/dialogs/dialog_gendrill_base.cpp b/pcbnew/dialogs/dialog_gendrill_base.cpp index 5f1d4047c7..01a7990b71 100644 --- a/pcbnew/dialogs/dialog_gendrill_base.cpp +++ b/pcbnew/dialogs/dialog_gendrill_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 6 2013) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -169,7 +169,7 @@ DIALOG_GENDRILL_BASE::DIALOG_GENDRILL_BASE( wxWindow* parent, wxWindowID id, con m_buttonDrill = new wxButton( this, ID_GEN_DRILL_FILE, _("Drill File"), wxDefaultPosition, wxDefaultSize, 0 ); m_buttonDrill->SetDefault(); - bSizerButtons->Add( m_buttonDrill, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); + bSizerButtons->Add( m_buttonDrill, 0, wxALL|wxEXPAND, 5 ); m_buttonMap = new wxButton( this, wxID_ANY, _("Map File"), wxDefaultPosition, wxDefaultSize, 0 ); bSizerButtons->Add( m_buttonMap, 0, wxALL|wxEXPAND, 5 ); @@ -178,7 +178,7 @@ DIALOG_GENDRILL_BASE::DIALOG_GENDRILL_BASE( wxWindow* parent, wxWindowID id, con bSizerButtons->Add( m_buttonReport, 0, wxALL|wxEXPAND, 5 ); m_CancelButton = new wxButton( this, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizerButtons->Add( m_CancelButton, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); + bSizerButtons->Add( m_CancelButton, 0, wxALL|wxEXPAND, 5 ); bmiddlerSizer->Add( bSizerButtons, 1, wxEXPAND, 5 ); diff --git a/pcbnew/dialogs/dialog_gendrill_base.fbp b/pcbnew/dialogs/dialog_gendrill_base.fbp index aa0178f3e2..b76bf71a8f 100644 --- a/pcbnew/dialogs/dialog_gendrill_base.fbp +++ b/pcbnew/dialogs/dialog_gendrill_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -1732,7 +1732,7 @@ 5 - wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -1996,7 +1996,7 @@ 5 - wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND + wxALL|wxEXPAND 0 1 diff --git a/pcbnew/dialogs/dialog_gendrill_base.h b/pcbnew/dialogs/dialog_gendrill_base.h index 7d5c27a9a7..79a669bc23 100644 --- a/pcbnew/dialogs/dialog_gendrill_base.h +++ b/pcbnew/dialogs/dialog_gendrill_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 6 2013) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! diff --git a/pcbnew/dialogs/dialog_global_deletion_base.cpp b/pcbnew/dialogs/dialog_global_deletion_base.cpp index b56bae82e5..52930bf276 100644 --- a/pcbnew/dialogs/dialog_global_deletion_base.cpp +++ b/pcbnew/dialogs/dialog_global_deletion_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Feb 26 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -94,7 +94,7 @@ DIALOG_GLOBAL_DELETION_BASE::DIALOG_GLOBAL_DELETION_BASE( wxWindow* parent, wxWi bSizerRight->Add( m_textCtrlCurrLayer, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - bSizerUpper->Add( bSizerRight, 3, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); + bSizerUpper->Add( bSizerRight, 3, wxALL|wxEXPAND, 5 ); bSizerMain->Add( bSizerUpper, 1, wxALL|wxEXPAND, 5 ); diff --git a/pcbnew/dialogs/dialog_global_deletion_base.fbp b/pcbnew/dialogs/dialog_global_deletion_base.fbp index 1053aa1bf2..cb6496e47d 100644 --- a/pcbnew/dialogs/dialog_global_deletion_base.fbp +++ b/pcbnew/dialogs/dialog_global_deletion_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -822,7 +822,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + wxALL|wxEXPAND 3 diff --git a/pcbnew/dialogs/dialog_global_deletion_base.h b/pcbnew/dialogs/dialog_global_deletion_base.h index d9d8042b78..21a9584660 100644 --- a/pcbnew/dialogs/dialog_global_deletion_base.h +++ b/pcbnew/dialogs/dialog_global_deletion_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Feb 26 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! diff --git a/pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp b/pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp index 6654ac2922..33ce483723 100644 --- a/pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp +++ b/pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 6 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -68,7 +68,7 @@ DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE::DIALOG_GLOBAL_MODULES_FIELDS_EDITION_ m_SizeX_Value = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_SizeX_Value->SetMaxLength( 0 ); - fgSizerCurrSettings->Add( m_SizeX_Value, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerCurrSettings->Add( m_SizeX_Value, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); m_SizeXunit = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_SizeXunit->Wrap( -1 ); @@ -80,7 +80,7 @@ DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE::DIALOG_GLOBAL_MODULES_FIELDS_EDITION_ m_SizeY_Value = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_SizeY_Value->SetMaxLength( 0 ); - fgSizerCurrSettings->Add( m_SizeY_Value, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); + fgSizerCurrSettings->Add( m_SizeY_Value, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); m_SizeYunit = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_SizeYunit->Wrap( -1 ); @@ -92,7 +92,7 @@ DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE::DIALOG_GLOBAL_MODULES_FIELDS_EDITION_ m_TicknessValue = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_TicknessValue->SetMaxLength( 0 ); - fgSizerCurrSettings->Add( m_TicknessValue, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); + fgSizerCurrSettings->Add( m_TicknessValue, 0, wxALL|wxEXPAND, 5 ); m_Ticknessunit = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_Ticknessunit->Wrap( -1 ); diff --git a/pcbnew/dialogs/dialog_global_modules_fields_edition_base.fbp b/pcbnew/dialogs/dialog_global_modules_fields_edition_base.fbp index b5a50432e1..3276eb7e0e 100644 --- a/pcbnew/dialogs/dialog_global_modules_fields_edition_base.fbp +++ b/pcbnew/dialogs/dialog_global_modules_fields_edition_base.fbp @@ -687,7 +687,7 @@ 5 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 0 1 @@ -944,7 +944,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT|wxTOP + wxEXPAND|wxLEFT|wxRIGHT|wxTOP 0 1 @@ -1201,7 +1201,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + wxALL|wxEXPAND 0 1 diff --git a/pcbnew/dialogs/dialog_global_modules_fields_edition_base.h b/pcbnew/dialogs/dialog_global_modules_fields_edition_base.h index a5a5ac3ddf..809771e716 100644 --- a/pcbnew/dialogs/dialog_global_modules_fields_edition_base.h +++ b/pcbnew/dialogs/dialog_global_modules_fields_edition_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 6 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! diff --git a/pcbnew/dialogs/dialog_graphic_item_properties_base.cpp b/pcbnew/dialogs/dialog_graphic_item_properties_base.cpp index 08498ae2a7..af7f4274be 100644 --- a/pcbnew/dialogs/dialog_graphic_item_properties_base.cpp +++ b/pcbnew/dialogs/dialog_graphic_item_properties_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 8 2012) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -96,7 +96,7 @@ DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE( wxWind m_Angle_Ctrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_Angle_Ctrl->SetMaxLength( 0 ); - fgUpperRightGridSizer->Add( m_Angle_Ctrl, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); + fgUpperRightGridSizer->Add( m_Angle_Ctrl, 0, wxALL|wxEXPAND, 5 ); m_AngleUnit = new wxStaticText( this, wxID_ANY, _("0.1 degree"), wxDefaultPosition, wxDefaultSize, 0 ); m_AngleUnit->Wrap( -1 ); @@ -108,7 +108,7 @@ DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE( wxWind m_ThicknessCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_ThicknessCtrl->SetMaxLength( 0 ); - fgUpperRightGridSizer->Add( m_ThicknessCtrl, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + fgUpperRightGridSizer->Add( m_ThicknessCtrl, 0, wxEXPAND|wxALL, 5 ); m_ThicknessTextUnit = new wxStaticText( this, wxID_ANY, _("Unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_ThicknessTextUnit->Wrap( -1 ); @@ -155,7 +155,7 @@ DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE( wxWind m_StandardButtonsSizer->AddButton( m_StandardButtonsSizerCancel ); m_StandardButtonsSizer->Realize(); - bMainSizer->Add( m_StandardButtonsSizer, 0, wxALIGN_BOTTOM|wxALIGN_RIGHT|wxALL, 5 ); + bMainSizer->Add( m_StandardButtonsSizer, 0, wxALIGN_RIGHT|wxALL, 5 ); this->SetSizer( bMainSizer ); diff --git a/pcbnew/dialogs/dialog_graphic_item_properties_base.fbp b/pcbnew/dialogs/dialog_graphic_item_properties_base.fbp index f661130d58..7352f7c2ea 100644 --- a/pcbnew/dialogs/dialog_graphic_item_properties_base.fbp +++ b/pcbnew/dialogs/dialog_graphic_item_properties_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -20,8 +20,10 @@ . 1 + 1 1 1 + UI 0 0 @@ -1337,7 +1339,7 @@ 5 - wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -1594,7 +1596,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL + wxEXPAND|wxALL 0 1 @@ -2296,7 +2298,7 @@ 5 - wxALIGN_BOTTOM|wxALIGN_RIGHT|wxALL + wxALIGN_RIGHT|wxALL 0 0 diff --git a/pcbnew/dialogs/dialog_graphic_item_properties_base.h b/pcbnew/dialogs/dialog_graphic_item_properties_base.h index 33857856d5..d4bce6ad24 100644 --- a/pcbnew/dialogs/dialog_graphic_item_properties_base.h +++ b/pcbnew/dialogs/dialog_graphic_item_properties_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 8 2012) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! diff --git a/pcbnew/dialogs/dialog_graphic_items_options_base.cpp b/pcbnew/dialogs/dialog_graphic_items_options_base.cpp index 683232e735..4f18597447 100644 --- a/pcbnew/dialogs/dialog_graphic_items_options_base.cpp +++ b/pcbnew/dialogs/dialog_graphic_items_options_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 6 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -129,7 +129,7 @@ DIALOG_GRAPHIC_ITEMS_OPTIONS_BASE::DIALOG_GRAPHIC_ITEMS_OPTIONS_BASE( wxWindow* m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1->Realize(); - bSizerMain->Add( m_sdbSizer1, 0, wxALIGN_RIGHT|wxEXPAND|wxTOP|wxBOTTOM, 5 ); + bSizerMain->Add( m_sdbSizer1, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 ); this->SetSizer( bSizerMain ); diff --git a/pcbnew/dialogs/dialog_graphic_items_options_base.fbp b/pcbnew/dialogs/dialog_graphic_items_options_base.fbp index d29afa81d7..f81f3d0e80 100644 --- a/pcbnew/dialogs/dialog_graphic_items_options_base.fbp +++ b/pcbnew/dialogs/dialog_graphic_items_options_base.fbp @@ -1888,7 +1888,7 @@ 5 - wxALIGN_RIGHT|wxEXPAND|wxTOP|wxBOTTOM + wxEXPAND|wxTOP|wxBOTTOM 0 0 diff --git a/pcbnew/dialogs/dialog_graphic_items_options_base.h b/pcbnew/dialogs/dialog_graphic_items_options_base.h index c889447144..7a672c0af4 100644 --- a/pcbnew/dialogs/dialog_graphic_items_options_base.h +++ b/pcbnew/dialogs/dialog_graphic_items_options_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 6 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! diff --git a/pcbnew/dialogs/dialog_keepout_area_properties_base.cpp b/pcbnew/dialogs/dialog_keepout_area_properties_base.cpp index e19a61aac3..6cb5f83d8b 100644 --- a/pcbnew/dialogs/dialog_keepout_area_properties_base.cpp +++ b/pcbnew/dialogs/dialog_keepout_area_properties_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 8 2012) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -48,13 +48,13 @@ DIALOG_KEEPOUT_AREA_PROPERTIES_BASE::DIALOG_KEEPOUT_AREA_PROPERTIES_BASE( wxWind int m_OrientEdgesOptNChoices = sizeof( m_OrientEdgesOptChoices ) / sizeof( wxString ); m_OrientEdgesOpt = new wxRadioBox( this, wxID_ANY, _("Zone Edges Orient"), wxDefaultPosition, wxDefaultSize, m_OrientEdgesOptNChoices, m_OrientEdgesOptChoices, 1, wxRA_SPECIFY_COLS ); m_OrientEdgesOpt->SetSelection( 0 ); - bSizerRight->Add( m_OrientEdgesOpt, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + bSizerRight->Add( m_OrientEdgesOpt, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); wxString m_OutlineAppearanceCtrlChoices[] = { _("Line"), _("Hatched Outline"), _("Full Hatched") }; int m_OutlineAppearanceCtrlNChoices = sizeof( m_OutlineAppearanceCtrlChoices ) / sizeof( wxString ); m_OutlineAppearanceCtrl = new wxRadioBox( this, wxID_ANY, _("Outlines Appearence"), wxDefaultPosition, wxDefaultSize, m_OutlineAppearanceCtrlNChoices, m_OutlineAppearanceCtrlChoices, 1, wxRA_SPECIFY_COLS ); m_OutlineAppearanceCtrl->SetSelection( 1 ); - bSizerRight->Add( m_OutlineAppearanceCtrl, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + bSizerRight->Add( m_OutlineAppearanceCtrl, 0, wxALL|wxEXPAND, 5 ); wxStaticBoxSizer* sbSizerCutoutOpts; sbSizerCutoutOpts = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Keepout Options:") ), wxVERTICAL ); @@ -75,7 +75,7 @@ DIALOG_KEEPOUT_AREA_PROPERTIES_BASE::DIALOG_KEEPOUT_AREA_PROPERTIES_BASE( wxWind m_UpperSizer->Add( bSizerRight, 0, wxEXPAND, 5 ); - m_MainSizer->Add( m_UpperSizer, 1, wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 ); + m_MainSizer->Add( m_UpperSizer, 1, wxEXPAND, 5 ); m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); m_MainSizer->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 ); diff --git a/pcbnew/dialogs/dialog_keepout_area_properties_base.fbp b/pcbnew/dialogs/dialog_keepout_area_properties_base.fbp index f1b207d843..f9f1d7243d 100644 --- a/pcbnew/dialogs/dialog_keepout_area_properties_base.fbp +++ b/pcbnew/dialogs/dialog_keepout_area_properties_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -20,8 +20,10 @@ . 1 + 1 1 1 + UI 0 0 @@ -93,7 +95,7 @@ none 5 - wxEXPAND|wxALIGN_CENTER_HORIZONTAL + wxEXPAND 1 @@ -393,7 +395,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 0 1 @@ -483,7 +485,7 @@ 5 - wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND + wxALL|wxEXPAND 0 1 diff --git a/pcbnew/dialogs/dialog_keepout_area_properties_base.h b/pcbnew/dialogs/dialog_keepout_area_properties_base.h index ac197b9c4f..c9973f58b3 100644 --- a/pcbnew/dialogs/dialog_keepout_area_properties_base.h +++ b/pcbnew/dialogs/dialog_keepout_area_properties_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 8 2012) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! diff --git a/pcbnew/dialogs/dialog_layers_setup_base.cpp b/pcbnew/dialogs/dialog_layers_setup_base.cpp index 67847f260f..1baa0a6dc0 100644 --- a/pcbnew/dialogs/dialog_layers_setup_base.cpp +++ b/pcbnew/dialogs/dialog_layers_setup_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -98,7 +98,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID bCaptionsSizer->Add( m_TitlePanel, 1, wxEXPAND, 5 ); - b_layersListSizer->Add( bCaptionsSizer, 0, wxALIGN_CENTER|wxEXPAND|wxRIGHT|wxLEFT, 5 ); + b_layersListSizer->Add( bCaptionsSizer, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); m_LayersListPanel = new wxScrolledWindow( this, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxRAISED_BORDER|wxTAB_TRAVERSAL|wxVSCROLL ); m_LayersListPanel->SetScrollRate( 0, 5 ); @@ -132,7 +132,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID m_CrtYdFrontPanel->SetSizer( bSizer611 ); m_CrtYdFrontPanel->Layout(); bSizer611->Fit( m_CrtYdFrontPanel ); - m_LayerListFlexGridSizer->Add( m_CrtYdFrontPanel, 1, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); + m_LayerListFlexGridSizer->Add( m_CrtYdFrontPanel, 1, wxEXPAND, 5 ); m_CrtYdFrontStaticText = new wxStaticText( m_LayersListPanel, ID_CRTYDFRONTCHOICE, _("Off-board, testing"), wxDefaultPosition, wxDefaultSize, 0 ); m_CrtYdFrontStaticText->Wrap( -1 ); @@ -157,7 +157,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID m_FabFrontPanel->SetSizer( bSizer61 ); m_FabFrontPanel->Layout(); bSizer61->Fit( m_FabFrontPanel ); - m_LayerListFlexGridSizer->Add( m_FabFrontPanel, 1, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); + m_LayerListFlexGridSizer->Add( m_FabFrontPanel, 1, wxEXPAND, 5 ); m_FabFrontStaticText = new wxStaticText( m_LayersListPanel, ID_FABFRONTCHOICE, _("Off-board, manufacturing"), wxDefaultPosition, wxDefaultSize, 0 ); m_FabFrontStaticText->Wrap( -1 ); @@ -182,7 +182,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID m_AdhesFrontPanel->SetSizer( bSizer6 ); m_AdhesFrontPanel->Layout(); bSizer6->Fit( m_AdhesFrontPanel ); - m_LayerListFlexGridSizer->Add( m_AdhesFrontPanel, 1, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); + m_LayerListFlexGridSizer->Add( m_AdhesFrontPanel, 1, wxEXPAND, 5 ); m_AdhesFrontStaticText = new wxStaticText( m_LayersListPanel, ID_ADHESFRONTCHOICE, _("Off-board, manufacturing"), wxDefaultPosition, wxDefaultSize, 0 ); m_AdhesFrontStaticText->Wrap( -1 ); @@ -207,7 +207,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID m_SoldPFrontPanel->SetSizer( bSizer7 ); m_SoldPFrontPanel->Layout(); bSizer7->Fit( m_SoldPFrontPanel ); - m_LayerListFlexGridSizer->Add( m_SoldPFrontPanel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); + m_LayerListFlexGridSizer->Add( m_SoldPFrontPanel, 1, wxEXPAND, 5 ); m_SoldPFrontStaticText = new wxStaticText( m_LayersListPanel, ID_SOLDPFRONTCHOICE, _("On-board, non-copper"), wxDefaultPosition, wxDefaultSize, 0 ); m_SoldPFrontStaticText->Wrap( -1 ); @@ -232,7 +232,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID m_SilkSFrontPanel->SetSizer( bSizer5 ); m_SilkSFrontPanel->Layout(); bSizer5->Fit( m_SilkSFrontPanel ); - m_LayerListFlexGridSizer->Add( m_SilkSFrontPanel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); + m_LayerListFlexGridSizer->Add( m_SilkSFrontPanel, 1, wxEXPAND, 5 ); m_SilkSFrontStaticText = new wxStaticText( m_LayersListPanel, ID_SILKSFRONTCHOICE, _("On-board, non-copper"), wxDefaultPosition, wxDefaultSize, 0 ); m_SilkSFrontStaticText->Wrap( -1 ); @@ -257,7 +257,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID m_MaskFrontPanel->SetSizer( bSizer8 ); m_MaskFrontPanel->Layout(); bSizer8->Fit( m_MaskFrontPanel ); - m_LayerListFlexGridSizer->Add( m_MaskFrontPanel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); + m_LayerListFlexGridSizer->Add( m_MaskFrontPanel, 1, wxEXPAND, 5 ); m_MaskFrontStaticText = new wxStaticText( m_LayersListPanel, ID_MASKFRONTCHOICE, _("On-board, non-copper"), wxDefaultPosition, wxDefaultSize, 0 ); m_MaskFrontStaticText->Wrap( -1 ); @@ -285,7 +285,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID m_FrontPanel->SetSizer( bSizer9 ); m_FrontPanel->Layout(); bSizer9->Fit( m_FrontPanel ); - m_LayerListFlexGridSizer->Add( m_FrontPanel, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 ); + m_LayerListFlexGridSizer->Add( m_FrontPanel, 1, wxEXPAND, 5 ); wxString m_FrontChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; int m_FrontChoiceNChoices = sizeof( m_FrontChoiceChoices ) / sizeof( wxString ); @@ -314,7 +314,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID m_In1Panel->SetSizer( bIn1Sizer ); m_In1Panel->Layout(); bIn1Sizer->Fit( m_In1Panel ); - m_LayerListFlexGridSizer->Add( m_In1Panel, 1, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 ); + m_LayerListFlexGridSizer->Add( m_In1Panel, 1, wxEXPAND, 5 ); wxString m_In1ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; int m_In1ChoiceNChoices = sizeof( m_In1ChoiceChoices ) / sizeof( wxString ); @@ -343,7 +343,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID m_In2Panel->SetSizer( bIn2Sizer ); m_In2Panel->Layout(); bIn2Sizer->Fit( m_In2Panel ); - m_LayerListFlexGridSizer->Add( m_In2Panel, 1, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 ); + m_LayerListFlexGridSizer->Add( m_In2Panel, 1, wxEXPAND, 5 ); wxString m_In2ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; int m_In2ChoiceNChoices = sizeof( m_In2ChoiceChoices ) / sizeof( wxString ); @@ -372,7 +372,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID m_In3Panel->SetSizer( bIn3Sizer ); m_In3Panel->Layout(); bIn3Sizer->Fit( m_In3Panel ); - m_LayerListFlexGridSizer->Add( m_In3Panel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); + m_LayerListFlexGridSizer->Add( m_In3Panel, 1, wxEXPAND, 5 ); wxString m_In3ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; int m_In3ChoiceNChoices = sizeof( m_In3ChoiceChoices ) / sizeof( wxString ); @@ -401,7 +401,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID m_In4Panel->SetSizer( bIn4Sizer ); m_In4Panel->Layout(); bIn4Sizer->Fit( m_In4Panel ); - m_LayerListFlexGridSizer->Add( m_In4Panel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); + m_LayerListFlexGridSizer->Add( m_In4Panel, 1, wxEXPAND, 5 ); wxString m_In4ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; int m_In4ChoiceNChoices = sizeof( m_In4ChoiceChoices ) / sizeof( wxString ); @@ -430,7 +430,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID m_In5Panel->SetSizer( bIn5Sizer ); m_In5Panel->Layout(); bIn5Sizer->Fit( m_In5Panel ); - m_LayerListFlexGridSizer->Add( m_In5Panel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); + m_LayerListFlexGridSizer->Add( m_In5Panel, 1, wxEXPAND, 5 ); wxString m_In5ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; int m_In5ChoiceNChoices = sizeof( m_In5ChoiceChoices ) / sizeof( wxString ); @@ -459,7 +459,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID m_In6Panel->SetSizer( bIn6Sizer ); m_In6Panel->Layout(); bIn6Sizer->Fit( m_In6Panel ); - m_LayerListFlexGridSizer->Add( m_In6Panel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); + m_LayerListFlexGridSizer->Add( m_In6Panel, 1, wxEXPAND, 5 ); wxString m_In6ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; int m_In6ChoiceNChoices = sizeof( m_In6ChoiceChoices ) / sizeof( wxString ); @@ -488,7 +488,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID m_In7Panel->SetSizer( bIn7Sizer ); m_In7Panel->Layout(); bIn7Sizer->Fit( m_In7Panel ); - m_LayerListFlexGridSizer->Add( m_In7Panel, 1, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 ); + m_LayerListFlexGridSizer->Add( m_In7Panel, 1, wxEXPAND, 5 ); wxString m_In7ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; int m_In7ChoiceNChoices = sizeof( m_In7ChoiceChoices ) / sizeof( wxString ); @@ -546,7 +546,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID m_In9Panel->SetSizer( bIn9Sizer ); m_In9Panel->Layout(); bIn9Sizer->Fit( m_In9Panel ); - m_LayerListFlexGridSizer->Add( m_In9Panel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); + m_LayerListFlexGridSizer->Add( m_In9Panel, 1, wxEXPAND, 5 ); wxString m_In9ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; int m_In9ChoiceNChoices = sizeof( m_In9ChoiceChoices ) / sizeof( wxString ); @@ -575,7 +575,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID m_In10Panel->SetSizer( bIn10Sizer ); m_In10Panel->Layout(); bIn10Sizer->Fit( m_In10Panel ); - m_LayerListFlexGridSizer->Add( m_In10Panel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); + m_LayerListFlexGridSizer->Add( m_In10Panel, 1, wxEXPAND, 5 ); wxString m_In10ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; int m_In10ChoiceNChoices = sizeof( m_In10ChoiceChoices ) / sizeof( wxString ); @@ -604,7 +604,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID m_In11Panel->SetSizer( bIn11Sizer ); m_In11Panel->Layout(); bIn11Sizer->Fit( m_In11Panel ); - m_LayerListFlexGridSizer->Add( m_In11Panel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); + m_LayerListFlexGridSizer->Add( m_In11Panel, 1, wxEXPAND, 5 ); wxString m_In11ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; int m_In11ChoiceNChoices = sizeof( m_In11ChoiceChoices ) / sizeof( wxString ); @@ -633,7 +633,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID m_In12Panel->SetSizer( bIn12Sizer ); m_In12Panel->Layout(); bIn12Sizer->Fit( m_In12Panel ); - m_LayerListFlexGridSizer->Add( m_In12Panel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); + m_LayerListFlexGridSizer->Add( m_In12Panel, 1, wxEXPAND, 5 ); wxString m_In12ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; int m_In12ChoiceNChoices = sizeof( m_In12ChoiceChoices ) / sizeof( wxString ); @@ -662,7 +662,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID m_In13Panel->SetSizer( bIn13Sizer ); m_In13Panel->Layout(); bIn13Sizer->Fit( m_In13Panel ); - m_LayerListFlexGridSizer->Add( m_In13Panel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); + m_LayerListFlexGridSizer->Add( m_In13Panel, 1, wxEXPAND, 5 ); wxString m_In13ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; int m_In13ChoiceNChoices = sizeof( m_In13ChoiceChoices ) / sizeof( wxString ); @@ -691,7 +691,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID m_In14Panel->SetSizer( bIn14Sizer ); m_In14Panel->Layout(); bIn14Sizer->Fit( m_In14Panel ); - m_LayerListFlexGridSizer->Add( m_In14Panel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); + m_LayerListFlexGridSizer->Add( m_In14Panel, 1, wxEXPAND, 5 ); wxString m_In14ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; int m_In14ChoiceNChoices = sizeof( m_In14ChoiceChoices ) / sizeof( wxString ); @@ -720,7 +720,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID m_In15Panel->SetSizer( bIn15Sizer ); m_In15Panel->Layout(); bIn15Sizer->Fit( m_In15Panel ); - m_LayerListFlexGridSizer->Add( m_In15Panel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); + m_LayerListFlexGridSizer->Add( m_In15Panel, 1, wxEXPAND, 5 ); wxString m_In15ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; int m_In15ChoiceNChoices = sizeof( m_In15ChoiceChoices ) / sizeof( wxString ); @@ -749,7 +749,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID m_In16Panel->SetSizer( bIn16Sizer ); m_In16Panel->Layout(); bIn16Sizer->Fit( m_In16Panel ); - m_LayerListFlexGridSizer->Add( m_In16Panel, 1, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 ); + m_LayerListFlexGridSizer->Add( m_In16Panel, 1, wxEXPAND, 5 ); wxString m_In16ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; int m_In16ChoiceNChoices = sizeof( m_In16ChoiceChoices ) / sizeof( wxString ); @@ -778,7 +778,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID m_In17Panel->SetSizer( bIn17Sizer ); m_In17Panel->Layout(); bIn17Sizer->Fit( m_In17Panel ); - m_LayerListFlexGridSizer->Add( m_In17Panel, 1, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 ); + m_LayerListFlexGridSizer->Add( m_In17Panel, 1, wxEXPAND, 5 ); wxString m_In17ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; int m_In17ChoiceNChoices = sizeof( m_In17ChoiceChoices ) / sizeof( wxString ); @@ -807,7 +807,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID m_In18Panel->SetSizer( bIn18Sizer ); m_In18Panel->Layout(); bIn18Sizer->Fit( m_In18Panel ); - m_LayerListFlexGridSizer->Add( m_In18Panel, 1, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 ); + m_LayerListFlexGridSizer->Add( m_In18Panel, 1, wxEXPAND, 5 ); wxString m_In18ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; int m_In18ChoiceNChoices = sizeof( m_In18ChoiceChoices ) / sizeof( wxString ); @@ -836,7 +836,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID m_In19Panel->SetSizer( bIn19Sizer ); m_In19Panel->Layout(); bIn19Sizer->Fit( m_In19Panel ); - m_LayerListFlexGridSizer->Add( m_In19Panel, 1, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 ); + m_LayerListFlexGridSizer->Add( m_In19Panel, 1, wxEXPAND, 5 ); wxString m_In19ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; int m_In19ChoiceNChoices = sizeof( m_In19ChoiceChoices ) / sizeof( wxString ); @@ -865,7 +865,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID m_In20Panel->SetSizer( bIn20Sizer ); m_In20Panel->Layout(); bIn20Sizer->Fit( m_In20Panel ); - m_LayerListFlexGridSizer->Add( m_In20Panel, 1, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 ); + m_LayerListFlexGridSizer->Add( m_In20Panel, 1, wxEXPAND, 5 ); wxString m_In20ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; int m_In20ChoiceNChoices = sizeof( m_In20ChoiceChoices ) / sizeof( wxString ); @@ -894,7 +894,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID m_In21Panel->SetSizer( bIn21Sizer ); m_In21Panel->Layout(); bIn21Sizer->Fit( m_In21Panel ); - m_LayerListFlexGridSizer->Add( m_In21Panel, 1, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 ); + m_LayerListFlexGridSizer->Add( m_In21Panel, 1, wxEXPAND, 5 ); wxString m_In21ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; int m_In21ChoiceNChoices = sizeof( m_In21ChoiceChoices ) / sizeof( wxString ); @@ -923,7 +923,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID m_In22Panel->SetSizer( bIn22Sizer ); m_In22Panel->Layout(); bIn22Sizer->Fit( m_In22Panel ); - m_LayerListFlexGridSizer->Add( m_In22Panel, 1, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 ); + m_LayerListFlexGridSizer->Add( m_In22Panel, 1, wxEXPAND, 5 ); wxString m_In22ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; int m_In22ChoiceNChoices = sizeof( m_In22ChoiceChoices ) / sizeof( wxString ); @@ -952,7 +952,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID m_In23Panel->SetSizer( bIn23Sizer ); m_In23Panel->Layout(); bIn23Sizer->Fit( m_In23Panel ); - m_LayerListFlexGridSizer->Add( m_In23Panel, 1, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 ); + m_LayerListFlexGridSizer->Add( m_In23Panel, 1, wxEXPAND, 5 ); wxString m_In23ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; int m_In23ChoiceNChoices = sizeof( m_In23ChoiceChoices ) / sizeof( wxString ); @@ -981,7 +981,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID m_In24Panel->SetSizer( bIn24Sizer ); m_In24Panel->Layout(); bIn24Sizer->Fit( m_In24Panel ); - m_LayerListFlexGridSizer->Add( m_In24Panel, 1, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 ); + m_LayerListFlexGridSizer->Add( m_In24Panel, 1, wxEXPAND, 5 ); wxString m_In24ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; int m_In24ChoiceNChoices = sizeof( m_In24ChoiceChoices ) / sizeof( wxString ); @@ -1010,7 +1010,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID m_In25Panel->SetSizer( bIn25Sizer ); m_In25Panel->Layout(); bIn25Sizer->Fit( m_In25Panel ); - m_LayerListFlexGridSizer->Add( m_In25Panel, 1, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 ); + m_LayerListFlexGridSizer->Add( m_In25Panel, 1, wxEXPAND, 5 ); wxString m_In25ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; int m_In25ChoiceNChoices = sizeof( m_In25ChoiceChoices ) / sizeof( wxString ); @@ -1039,7 +1039,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID m_In26Panel->SetSizer( bIn26Sizer ); m_In26Panel->Layout(); bIn26Sizer->Fit( m_In26Panel ); - m_LayerListFlexGridSizer->Add( m_In26Panel, 1, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 ); + m_LayerListFlexGridSizer->Add( m_In26Panel, 1, wxEXPAND, 5 ); wxString m_In26ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; int m_In26ChoiceNChoices = sizeof( m_In26ChoiceChoices ) / sizeof( wxString ); @@ -1068,7 +1068,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID m_In27Panel->SetSizer( bIn27Sizer ); m_In27Panel->Layout(); bIn27Sizer->Fit( m_In27Panel ); - m_LayerListFlexGridSizer->Add( m_In27Panel, 1, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 ); + m_LayerListFlexGridSizer->Add( m_In27Panel, 1, wxEXPAND, 5 ); wxString m_In27ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; int m_In27ChoiceNChoices = sizeof( m_In27ChoiceChoices ) / sizeof( wxString ); @@ -1097,7 +1097,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID m_In28Panel->SetSizer( bIn28Sizer ); m_In28Panel->Layout(); bIn28Sizer->Fit( m_In28Panel ); - m_LayerListFlexGridSizer->Add( m_In28Panel, 1, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 ); + m_LayerListFlexGridSizer->Add( m_In28Panel, 1, wxEXPAND, 5 ); wxString m_In28ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; int m_In28ChoiceNChoices = sizeof( m_In28ChoiceChoices ) / sizeof( wxString ); @@ -1126,7 +1126,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID m_In29Panel->SetSizer( bIn29Sizer ); m_In29Panel->Layout(); bIn29Sizer->Fit( m_In29Panel ); - m_LayerListFlexGridSizer->Add( m_In29Panel, 1, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 ); + m_LayerListFlexGridSizer->Add( m_In29Panel, 1, wxEXPAND, 5 ); wxString m_In29ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; int m_In29ChoiceNChoices = sizeof( m_In29ChoiceChoices ) / sizeof( wxString ); @@ -1155,7 +1155,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID m_In30Panel->SetSizer( bIn30Sizer ); m_In30Panel->Layout(); bIn30Sizer->Fit( m_In30Panel ); - m_LayerListFlexGridSizer->Add( m_In30Panel, 1, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 ); + m_LayerListFlexGridSizer->Add( m_In30Panel, 1, wxEXPAND, 5 ); wxString m_In30ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; int m_In30ChoiceNChoices = sizeof( m_In30ChoiceChoices ) / sizeof( wxString ); @@ -1187,7 +1187,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID m_BackPanel->SetSizer( bBackSizer ); m_BackPanel->Layout(); bBackSizer->Fit( m_BackPanel ); - m_LayerListFlexGridSizer->Add( m_BackPanel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); + m_LayerListFlexGridSizer->Add( m_BackPanel, 1, wxEXPAND, 5 ); wxString m_BackChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; int m_BackChoiceNChoices = sizeof( m_BackChoiceChoices ) / sizeof( wxString ); @@ -1216,7 +1216,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID m_MaskBackPanel->SetSizer( bSizer24 ); m_MaskBackPanel->Layout(); bSizer24->Fit( m_MaskBackPanel ); - m_LayerListFlexGridSizer->Add( m_MaskBackPanel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); + m_LayerListFlexGridSizer->Add( m_MaskBackPanel, 1, wxEXPAND, 5 ); m_MaskBackStaticText = new wxStaticText( m_LayersListPanel, ID_MASKBACKCHOICE, _("On-board, non-copper"), wxDefaultPosition, wxDefaultSize, 0 ); m_MaskBackStaticText->Wrap( -1 ); @@ -1241,7 +1241,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID m_SilkSBackPanel->SetSizer( bSizer25 ); m_SilkSBackPanel->Layout(); bSizer25->Fit( m_SilkSBackPanel ); - m_LayerListFlexGridSizer->Add( m_SilkSBackPanel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); + m_LayerListFlexGridSizer->Add( m_SilkSBackPanel, 1, wxEXPAND, 5 ); m_SilkSBackStaticText = new wxStaticText( m_LayersListPanel, ID_SILKSBACKCHOICE, _("On-board, non-copper"), wxDefaultPosition, wxDefaultSize, 0 ); m_SilkSBackStaticText->Wrap( -1 ); @@ -1266,7 +1266,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID m_SoldPBackPanel->SetSizer( bSizer26 ); m_SoldPBackPanel->Layout(); bSizer26->Fit( m_SoldPBackPanel ); - m_LayerListFlexGridSizer->Add( m_SoldPBackPanel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); + m_LayerListFlexGridSizer->Add( m_SoldPBackPanel, 1, wxEXPAND, 5 ); m_SoldPBackStaticText = new wxStaticText( m_LayersListPanel, ID_SOLDPBACKCHOICE, _("On-board, non-copper"), wxDefaultPosition, wxDefaultSize, 0 ); m_SoldPBackStaticText->Wrap( -1 ); @@ -1291,7 +1291,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID m_AdhesBackPanel->SetSizer( bSizer27 ); m_AdhesBackPanel->Layout(); bSizer27->Fit( m_AdhesBackPanel ); - m_LayerListFlexGridSizer->Add( m_AdhesBackPanel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); + m_LayerListFlexGridSizer->Add( m_AdhesBackPanel, 1, wxEXPAND, 5 ); m_AdhesBackStaticText = new wxStaticText( m_LayersListPanel, ID_ADHESBACKCHOICE, _("Off-board, manufacturing"), wxDefaultPosition, wxDefaultSize, 0 ); m_AdhesBackStaticText->Wrap( -1 ); @@ -1341,7 +1341,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID m_CrtYdBackPanel->SetSizer( bSizer6111 ); m_CrtYdBackPanel->Layout(); bSizer6111->Fit( m_CrtYdBackPanel ); - m_LayerListFlexGridSizer->Add( m_CrtYdBackPanel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + m_LayerListFlexGridSizer->Add( m_CrtYdBackPanel, 1, wxEXPAND, 5 ); m_CrtYdBackStaticText = new wxStaticText( m_LayersListPanel, ID_CRTYDBACKCHOICE, _("Off-board, testing"), wxDefaultPosition, wxDefaultSize, 0 ); m_CrtYdBackStaticText->Wrap( -1 ); @@ -1366,7 +1366,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID m_PCBEdgesPanel->SetSizer( bSizer28 ); m_PCBEdgesPanel->Layout(); bSizer28->Fit( m_PCBEdgesPanel ); - m_LayerListFlexGridSizer->Add( m_PCBEdgesPanel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); + m_LayerListFlexGridSizer->Add( m_PCBEdgesPanel, 1, wxEXPAND, 5 ); m_PCBEdgesStaticText = new wxStaticText( m_LayersListPanel, ID_PCBEDGESCHOICE, _("Board contour"), wxDefaultPosition, wxDefaultSize, 0 ); m_PCBEdgesStaticText->Wrap( -1 ); @@ -1389,7 +1389,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID m_MarginPanel->SetSizer( bSizer291 ); m_MarginPanel->Layout(); bSizer291->Fit( m_MarginPanel ); - m_LayerListFlexGridSizer->Add( m_MarginPanel, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); + m_LayerListFlexGridSizer->Add( m_MarginPanel, 1, wxEXPAND, 5 ); m_MarginStaticText = new wxStaticText( m_LayersListPanel, ID_ECO2CHOICE, _("Edge_Cuts setback"), wxDefaultPosition, wxDefaultSize, 0 ); m_MarginStaticText->Wrap( -1 ); @@ -1412,7 +1412,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID m_Eco1Panel->SetSizer( bSizer29 ); m_Eco1Panel->Layout(); bSizer29->Fit( m_Eco1Panel ); - m_LayerListFlexGridSizer->Add( m_Eco1Panel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); + m_LayerListFlexGridSizer->Add( m_Eco1Panel, 1, wxEXPAND, 5 ); m_Eco1StaticText = new wxStaticText( m_LayersListPanel, ID_ECO2CHOICE, _("Auxiliary"), wxDefaultPosition, wxDefaultSize, 0 ); m_Eco1StaticText->Wrap( -1 ); @@ -1435,7 +1435,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID m_Eco2Panel->SetSizer( bSizer30 ); m_Eco2Panel->Layout(); bSizer30->Fit( m_Eco2Panel ); - m_LayerListFlexGridSizer->Add( m_Eco2Panel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); + m_LayerListFlexGridSizer->Add( m_Eco2Panel, 1, wxEXPAND, 5 ); m_Eco2StaticText = new wxStaticText( m_LayersListPanel, ID_ECO1CHOICE, _("Auxiliary"), wxDefaultPosition, wxDefaultSize, 0 ); m_Eco2StaticText->Wrap( -1 ); @@ -1460,7 +1460,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID m_CommentsPanel->SetSizer( bSizer31 ); m_CommentsPanel->Layout(); bSizer31->Fit( m_CommentsPanel ); - m_LayerListFlexGridSizer->Add( m_CommentsPanel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); + m_LayerListFlexGridSizer->Add( m_CommentsPanel, 1, wxEXPAND, 5 ); m_CommentsStaticText = new wxStaticText( m_LayersListPanel, ID_COMMENTSCHOICE, _("Auxiliary"), wxDefaultPosition, wxDefaultSize, 0 ); m_CommentsStaticText->Wrap( -1 ); @@ -1485,7 +1485,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID m_DrawingsPanel->SetSizer( bSizer32 ); m_DrawingsPanel->Layout(); bSizer32->Fit( m_DrawingsPanel ); - m_LayerListFlexGridSizer->Add( m_DrawingsPanel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); + m_LayerListFlexGridSizer->Add( m_DrawingsPanel, 1, wxEXPAND, 5 ); m_DrawingsStaticText = new wxStaticText( m_LayersListPanel, ID_DRAWINGSCHOICE, _("Auxiliary"), wxDefaultPosition, wxDefaultSize, 0 ); m_DrawingsStaticText->Wrap( -1 ); diff --git a/pcbnew/dialogs/dialog_layers_setup_base.fbp b/pcbnew/dialogs/dialog_layers_setup_base.fbp index dcba49444d..3be3422b77 100644 --- a/pcbnew/dialogs/dialog_layers_setup_base.fbp +++ b/pcbnew/dialogs/dialog_layers_setup_base.fbp @@ -848,7 +848,7 @@ 5 - wxALIGN_CENTER|wxEXPAND|wxRIGHT|wxLEFT + wxEXPAND|wxRIGHT|wxLEFT 0 @@ -1114,7 +1114,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND + wxEXPAND 1 1 @@ -1474,7 +1474,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND + wxEXPAND 1 1 @@ -1814,7 +1814,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND + wxEXPAND 1 1 @@ -2154,7 +2154,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL + wxEXPAND 1 1 @@ -2494,7 +2494,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL + wxEXPAND 1 1 @@ -2834,7 +2834,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL + wxEXPAND 1 1 @@ -3182,7 +3182,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL + wxEXPAND 1 1 @@ -3535,7 +3535,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL + wxEXPAND 1 1 @@ -3888,7 +3888,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL + wxEXPAND 1 1 @@ -4241,7 +4241,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL + wxEXPAND 1 1 @@ -4594,7 +4594,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL + wxEXPAND 1 1 @@ -4947,7 +4947,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL + wxEXPAND 1 1 @@ -5300,7 +5300,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL + wxEXPAND 1 1 @@ -5653,7 +5653,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL + wxEXPAND 1 1 @@ -6359,7 +6359,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL + wxEXPAND 1 1 @@ -6712,7 +6712,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL + wxEXPAND 1 1 @@ -7065,7 +7065,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL + wxEXPAND 1 1 @@ -7418,7 +7418,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL + wxEXPAND 1 1 @@ -7771,7 +7771,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL + wxEXPAND 1 1 @@ -8124,7 +8124,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL + wxEXPAND 1 1 @@ -8477,7 +8477,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL + wxEXPAND 1 1 @@ -8830,7 +8830,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL + wxEXPAND 1 1 @@ -9183,7 +9183,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL + wxEXPAND 1 1 @@ -9536,7 +9536,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL + wxEXPAND 1 1 @@ -9889,7 +9889,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL + wxEXPAND 1 1 @@ -10242,7 +10242,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL + wxEXPAND 1 1 @@ -10595,7 +10595,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL + wxEXPAND 1 1 @@ -10948,7 +10948,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL + wxEXPAND 1 1 @@ -11301,7 +11301,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL + wxEXPAND 1 1 @@ -11654,7 +11654,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL + wxEXPAND 1 1 @@ -12007,7 +12007,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL + wxEXPAND 1 1 @@ -12360,7 +12360,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL + wxEXPAND 1 1 @@ -12713,7 +12713,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL + wxEXPAND 1 1 @@ -13066,7 +13066,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL + wxEXPAND 1 1 @@ -13419,7 +13419,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL + wxEXPAND 1 1 @@ -13772,7 +13772,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL + wxEXPAND 1 1 @@ -14125,7 +14125,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL + wxEXPAND 1 1 @@ -14470,7 +14470,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL + wxEXPAND 1 1 @@ -14810,7 +14810,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL + wxEXPAND 1 1 @@ -15150,7 +15150,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL + wxEXPAND 1 1 @@ -15490,7 +15490,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL + wxEXPAND 1 1 @@ -16170,7 +16170,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL + wxEXPAND 1 1 @@ -16510,7 +16510,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL + wxEXPAND 1 1 @@ -16850,7 +16850,7 @@ 5 - wxALIGN_CENTER_HORIZONTAL|wxEXPAND + wxEXPAND 1 1 @@ -17190,7 +17190,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL + wxEXPAND 1 1 @@ -17530,7 +17530,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL + wxEXPAND 1 1 @@ -17870,7 +17870,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL + wxEXPAND 1 1 @@ -18210,7 +18210,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL + wxEXPAND 1 1 diff --git a/pcbnew/dialogs/dialog_layers_setup_base.h b/pcbnew/dialogs/dialog_layers_setup_base.h index 539e9c3ea4..a86656794d 100644 --- a/pcbnew/dialogs/dialog_layers_setup_base.h +++ b/pcbnew/dialogs/dialog_layers_setup_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! diff --git a/pcbnew/dialogs/dialog_mask_clearance_base.cpp b/pcbnew/dialogs/dialog_mask_clearance_base.cpp index 7480510472..16699cb900 100644 --- a/pcbnew/dialogs/dialog_mask_clearance_base.cpp +++ b/pcbnew/dialogs/dialog_mask_clearance_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 8 2012) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -45,7 +45,7 @@ DIALOG_PADS_MASK_CLEARANCE_BASE::DIALOG_PADS_MASK_CLEARANCE_BASE( wxWindow* pare m_SolderMaskMarginCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_SolderMaskMarginCtrl->SetMaxLength( 0 ); - fgGridSolderMaskSizer->Add( m_SolderMaskMarginCtrl, 0, wxEXPAND|wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + fgGridSolderMaskSizer->Add( m_SolderMaskMarginCtrl, 0, wxEXPAND|wxALL, 5 ); m_SolderMaskMarginUnits = new wxStaticText( this, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 ); m_SolderMaskMarginUnits->Wrap( -1 ); @@ -59,7 +59,7 @@ DIALOG_PADS_MASK_CLEARANCE_BASE::DIALOG_PADS_MASK_CLEARANCE_BASE( wxWindow* pare m_SolderMaskMinWidthCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_SolderMaskMinWidthCtrl->SetMaxLength( 0 ); - fgGridSolderMaskSizer->Add( m_SolderMaskMinWidthCtrl, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + fgGridSolderMaskSizer->Add( m_SolderMaskMinWidthCtrl, 0, wxALL|wxEXPAND, 5 ); m_solderMaskMinWidthUnit = new wxStaticText( this, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 ); m_solderMaskMinWidthUnit->Wrap( -1 ); @@ -82,7 +82,7 @@ DIALOG_PADS_MASK_CLEARANCE_BASE::DIALOG_PADS_MASK_CLEARANCE_BASE( wxWindow* pare m_SolderPasteMarginCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_SolderPasteMarginCtrl->SetMaxLength( 0 ); - fgGridSolderMaskSizer->Add( m_SolderPasteMarginCtrl, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + fgGridSolderMaskSizer->Add( m_SolderPasteMarginCtrl, 0, wxALL|wxEXPAND, 5 ); m_SolderPasteMarginUnits = new wxStaticText( this, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 ); m_SolderPasteMarginUnits->Wrap( -1 ); @@ -96,7 +96,7 @@ DIALOG_PADS_MASK_CLEARANCE_BASE::DIALOG_PADS_MASK_CLEARANCE_BASE( wxWindow* pare m_SolderPasteMarginRatioCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_SolderPasteMarginRatioCtrl->SetMaxLength( 0 ); - fgGridSolderMaskSizer->Add( m_SolderPasteMarginRatioCtrl, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + fgGridSolderMaskSizer->Add( m_SolderPasteMarginRatioCtrl, 0, wxALL|wxEXPAND, 5 ); m_SolderPasteRatioMarginUnits = new wxStaticText( this, wxID_ANY, _("%"), wxDefaultPosition, wxDefaultSize, 0 ); m_SolderPasteRatioMarginUnits->Wrap( -1 ); diff --git a/pcbnew/dialogs/dialog_mask_clearance_base.fbp b/pcbnew/dialogs/dialog_mask_clearance_base.fbp index 44681b5a44..bb99b7dd11 100644 --- a/pcbnew/dialogs/dialog_mask_clearance_base.fbp +++ b/pcbnew/dialogs/dialog_mask_clearance_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -20,8 +20,10 @@ . 1 + 1 1 1 + UI 1 0 @@ -365,7 +367,7 @@ 5 - wxEXPAND|wxALL|wxALIGN_CENTER_VERTICAL + wxEXPAND|wxALL 0 1 @@ -622,7 +624,7 @@ 5 - wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -1122,7 +1124,7 @@ 5 - wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -1379,7 +1381,7 @@ 5 - wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND + wxALL|wxEXPAND 0 1 diff --git a/pcbnew/dialogs/dialog_mask_clearance_base.h b/pcbnew/dialogs/dialog_mask_clearance_base.h index 894d619ea6..d7ca21e96a 100644 --- a/pcbnew/dialogs/dialog_mask_clearance_base.h +++ b/pcbnew/dialogs/dialog_mask_clearance_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 8 2012) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! diff --git a/pcbnew/dialogs/dialog_modedit_options_base.cpp b/pcbnew/dialogs/dialog_modedit_options_base.cpp index d0769d2311..e9402258e3 100644 --- a/pcbnew/dialogs/dialog_modedit_options_base.cpp +++ b/pcbnew/dialogs/dialog_modedit_options_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -120,7 +120,7 @@ DIALOG_MODEDIT_OPTIONS_BASE::DIALOG_MODEDIT_OPTIONS_BASE( wxWindow* parent, wxWi int m_choiceLayerReferenceNChoices = sizeof( m_choiceLayerReferenceChoices ) / sizeof( wxString ); m_choiceLayerReference = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceLayerReferenceNChoices, m_choiceLayerReferenceChoices, 0 ); m_choiceLayerReference->SetSelection( 0 ); - fgSizer2->Add( m_choiceLayerReference, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + fgSizer2->Add( m_choiceLayerReference, 0, wxALL|wxEXPAND, 5 ); m_staticText32 = new wxStaticText( this, wxID_ANY, _("Visibility"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText32->Wrap( -1 ); @@ -149,7 +149,7 @@ DIALOG_MODEDIT_OPTIONS_BASE::DIALOG_MODEDIT_OPTIONS_BASE( wxWindow* parent, wxWi int m_choiceLayerValueNChoices = sizeof( m_choiceLayerValueChoices ) / sizeof( wxString ); m_choiceLayerValue = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceLayerValueNChoices, m_choiceLayerValueChoices, 0 ); m_choiceLayerValue->SetSelection( 1 ); - fgSizer2->Add( m_choiceLayerValue, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + fgSizer2->Add( m_choiceLayerValue, 0, wxALL|wxEXPAND, 5 ); m_staticTextValVisibility = new wxStaticText( this, wxID_ANY, _("Visibility"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextValVisibility->Wrap( -1 ); @@ -177,7 +177,7 @@ DIALOG_MODEDIT_OPTIONS_BASE::DIALOG_MODEDIT_OPTIONS_BASE( wxWindow* parent, wxWi m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1->Realize(); - bSizerMain->Add( m_sdbSizer1, 0, wxALIGN_RIGHT|wxEXPAND|wxTOP|wxBOTTOM, 5 ); + bSizerMain->Add( m_sdbSizer1, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 ); this->SetSizer( bSizerMain ); diff --git a/pcbnew/dialogs/dialog_modedit_options_base.fbp b/pcbnew/dialogs/dialog_modedit_options_base.fbp index b5dc8fc06e..0d01a5bc7f 100644 --- a/pcbnew/dialogs/dialog_modedit_options_base.fbp +++ b/pcbnew/dialogs/dialog_modedit_options_base.fbp @@ -1753,7 +1753,7 @@ 5 - wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -2269,7 +2269,7 @@ 5 - wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -2613,7 +2613,7 @@ 5 - wxALIGN_RIGHT|wxEXPAND|wxTOP|wxBOTTOM + wxEXPAND|wxTOP|wxBOTTOM 0 0 diff --git a/pcbnew/dialogs/dialog_modedit_options_base.h b/pcbnew/dialogs/dialog_modedit_options_base.h index b11c2398be..1da570d586 100644 --- a/pcbnew/dialogs/dialog_modedit_options_base.h +++ b/pcbnew/dialogs/dialog_modedit_options_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! diff --git a/pcbnew/dialogs/dialog_move_exact.fbp b/pcbnew/dialogs/dialog_move_exact.fbp index 746512baf6..02dbd01434 100644 --- a/pcbnew/dialogs/dialog_move_exact.fbp +++ b/pcbnew/dialogs/dialog_move_exact.fbp @@ -282,7 +282,7 @@ 5 - wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL + wxALL|wxEXPAND 0 1 @@ -632,7 +632,7 @@ 5 - wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL + wxALL|wxEXPAND 0 1 @@ -982,7 +982,7 @@ 5 - wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL + wxALL|wxEXPAND 0 1 diff --git a/pcbnew/dialogs/dialog_move_exact_base.cpp b/pcbnew/dialogs/dialog_move_exact_base.cpp index ef4a8bfc1d..bddfdfc8d8 100644 --- a/pcbnew/dialogs/dialog_move_exact_base.cpp +++ b/pcbnew/dialogs/dialog_move_exact_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -30,7 +30,7 @@ DIALOG_MOVE_EXACT_BASE::DIALOG_MOVE_EXACT_BASE( wxWindow* parent, wxWindowID id, fgSizer2->Add( m_xLabel, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); m_xEntry = new wxTextCtrl( this, wxID_ANY, _("0"), wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer2->Add( m_xEntry, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizer2->Add( m_xEntry, 0, wxALL|wxEXPAND, 5 ); m_xUnit = new wxStaticText( this, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); m_xUnit->Wrap( -1 ); @@ -44,7 +44,7 @@ DIALOG_MOVE_EXACT_BASE::DIALOG_MOVE_EXACT_BASE( wxWindow* parent, wxWindowID id, fgSizer2->Add( m_yLabel, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); m_yEntry = new wxTextCtrl( this, wxID_ANY, _("0"), wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer2->Add( m_yEntry, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizer2->Add( m_yEntry, 0, wxALL|wxEXPAND, 5 ); m_yUnit = new wxStaticText( this, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); m_yUnit->Wrap( -1 ); @@ -58,7 +58,7 @@ DIALOG_MOVE_EXACT_BASE::DIALOG_MOVE_EXACT_BASE( wxWindow* parent, wxWindowID id, fgSizer2->Add( m_rotLabel, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); m_rotEntry = new wxTextCtrl( this, wxID_ANY, _("0"), wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer2->Add( m_rotEntry, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizer2->Add( m_rotEntry, 0, wxALL|wxEXPAND, 5 ); m_rotUnit = new wxStaticText( this, wxID_ANY, _("deg"), wxDefaultPosition, wxDefaultSize, 0 ); m_rotUnit->Wrap( -1 ); diff --git a/pcbnew/dialogs/dialog_move_exact_base.h b/pcbnew/dialogs/dialog_move_exact_base.h index cb20c1aaca..9040369239 100644 --- a/pcbnew/dialogs/dialog_move_exact_base.h +++ b/pcbnew/dialogs/dialog_move_exact_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! diff --git a/pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp b/pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp index 4d5c254f31..c41ffc2840 100644 --- a/pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp +++ b/pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 6 2013) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -47,13 +47,13 @@ DIALOG_NONCOPPER_ZONES_PROPERTIES_BASE::DIALOG_NONCOPPER_ZONES_PROPERTIES_BASE( int m_OrientEdgesOptNChoices = sizeof( m_OrientEdgesOptChoices ) / sizeof( wxString ); m_OrientEdgesOpt = new wxRadioBox( this, wxID_ANY, _("Zone Edges Orient"), wxDefaultPosition, wxDefaultSize, m_OrientEdgesOptNChoices, m_OrientEdgesOptChoices, 1, wxRA_SPECIFY_COLS ); m_OrientEdgesOpt->SetSelection( 0 ); - m_OutilinesBoxOpt->Add( m_OrientEdgesOpt, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + m_OutilinesBoxOpt->Add( m_OrientEdgesOpt, 0, wxALL|wxEXPAND, 5 ); wxString m_OutlineAppearanceCtrlChoices[] = { _("Line"), _("Hatched Outline"), _("Full Hatched") }; int m_OutlineAppearanceCtrlNChoices = sizeof( m_OutlineAppearanceCtrlChoices ) / sizeof( wxString ); m_OutlineAppearanceCtrl = new wxRadioBox( this, wxID_ANY, _("Outlines Appearence"), wxDefaultPosition, wxDefaultSize, m_OutlineAppearanceCtrlNChoices, m_OutlineAppearanceCtrlChoices, 1, wxRA_SPECIFY_COLS ); m_OutlineAppearanceCtrl->SetSelection( 1 ); - m_OutilinesBoxOpt->Add( m_OutlineAppearanceCtrl, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + m_OutilinesBoxOpt->Add( m_OutlineAppearanceCtrl, 0, wxALL|wxEXPAND, 5 ); bSizerRight->Add( m_OutilinesBoxOpt, 0, wxEXPAND|wxALL, 5 ); @@ -70,7 +70,7 @@ DIALOG_NONCOPPER_ZONES_PROPERTIES_BASE::DIALOG_NONCOPPER_ZONES_PROPERTIES_BASE( m_UpperSizer->Add( bSizerRight, 0, wxEXPAND, 5 ); - m_MainSizer->Add( m_UpperSizer, 1, wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 ); + m_MainSizer->Add( m_UpperSizer, 1, wxEXPAND, 5 ); m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); m_MainSizer->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 ); diff --git a/pcbnew/dialogs/dialog_non_copper_zones_properties_base.fbp b/pcbnew/dialogs/dialog_non_copper_zones_properties_base.fbp index c543505ccc..20f6296047 100644 --- a/pcbnew/dialogs/dialog_non_copper_zones_properties_base.fbp +++ b/pcbnew/dialogs/dialog_non_copper_zones_properties_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -95,7 +95,7 @@ none 5 - wxEXPAND|wxALIGN_CENTER_HORIZONTAL + wxEXPAND 1 @@ -324,7 +324,7 @@ 5 - wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -414,7 +414,7 @@ 5 - wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND + wxALL|wxEXPAND 0 1 diff --git a/pcbnew/dialogs/dialog_non_copper_zones_properties_base.h b/pcbnew/dialogs/dialog_non_copper_zones_properties_base.h index 4890a2872d..05cc56d5c6 100644 --- a/pcbnew/dialogs/dialog_non_copper_zones_properties_base.h +++ b/pcbnew/dialogs/dialog_non_copper_zones_properties_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 6 2013) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! diff --git a/pcbnew/dialogs/dialog_pad_properties_base.cpp b/pcbnew/dialogs/dialog_pad_properties_base.cpp index 0550e54d97..0770149878 100644 --- a/pcbnew/dialogs/dialog_pad_properties_base.cpp +++ b/pcbnew/dialogs/dialog_pad_properties_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -41,7 +41,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind m_PadNumCtrl = new wxTextCtrl( m_panelGeneral, wxID_PADNUMCTRL, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_PadNumCtrl->SetMaxLength( 0 ); - fgSizerPadType->Add( m_PadNumCtrl, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); + fgSizerPadType->Add( m_PadNumCtrl, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); m_PadNameText = new wxStaticText( m_panelGeneral, wxID_ANY, _("Net name:"), wxDefaultPosition, wxDefaultSize, 0 ); m_PadNameText->Wrap( -1 ); @@ -49,7 +49,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind m_PadNetNameCtrl = new wxTextCtrl( m_panelGeneral, wxID_PADNETNAMECTRL, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_PadNetNameCtrl->SetMaxLength( 0 ); - fgSizerPadType->Add( m_PadNetNameCtrl, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); + fgSizerPadType->Add( m_PadNetNameCtrl, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); m_staticText44 = new wxStaticText( m_panelGeneral, wxID_ANY, _("Pad type:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText44->Wrap( -1 ); @@ -59,7 +59,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind int m_PadTypeNChoices = sizeof( m_PadTypeChoices ) / sizeof( wxString ); m_PadType = new wxChoice( m_panelGeneral, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_PadTypeNChoices, m_PadTypeChoices, 0 ); m_PadType->SetSelection( 0 ); - fgSizerPadType->Add( m_PadType, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); + fgSizerPadType->Add( m_PadType, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); m_staticText45 = new wxStaticText( m_panelGeneral, wxID_ANY, _("Shape:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText45->Wrap( -1 ); @@ -69,7 +69,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind int m_PadShapeNChoices = sizeof( m_PadShapeChoices ) / sizeof( wxString ); m_PadShape = new wxChoice( m_panelGeneral, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_PadShapeNChoices, m_PadShapeChoices, 0 ); m_PadShape->SetSelection( 0 ); - fgSizerPadType->Add( m_PadShape, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); + fgSizerPadType->Add( m_PadShape, 0, wxALL|wxEXPAND, 5 ); m_LeftBoxSizer->Add( fgSizerPadType, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); @@ -86,7 +86,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind m_PadPosition_X_Ctrl = new wxTextCtrl( m_panelGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_PadPosition_X_Ctrl->SetMaxLength( 0 ); - fgSizerShapeType->Add( m_PadPosition_X_Ctrl, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxTOP, 5 ); + fgSizerShapeType->Add( m_PadPosition_X_Ctrl, 0, wxEXPAND|wxLEFT|wxTOP, 5 ); m_PadPosX_Unit = new wxStaticText( m_panelGeneral, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 ); m_PadPosX_Unit->Wrap( -1 ); @@ -98,7 +98,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind m_PadPosition_Y_Ctrl = new wxTextCtrl( m_panelGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_PadPosition_Y_Ctrl->SetMaxLength( 0 ); - fgSizerShapeType->Add( m_PadPosition_Y_Ctrl, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxTOP, 5 ); + fgSizerShapeType->Add( m_PadPosition_Y_Ctrl, 0, wxEXPAND|wxLEFT|wxTOP, 5 ); m_PadPosY_Unit = new wxStaticText( m_panelGeneral, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 ); m_PadPosY_Unit->Wrap( -1 ); @@ -110,7 +110,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind m_ShapeSize_X_Ctrl = new wxTextCtrl( m_panelGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_ShapeSize_X_Ctrl->SetMaxLength( 0 ); - fgSizerShapeType->Add( m_ShapeSize_X_Ctrl, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxTOP, 5 ); + fgSizerShapeType->Add( m_ShapeSize_X_Ctrl, 0, wxEXPAND|wxLEFT|wxTOP, 5 ); m_PadShapeSizeX_Unit = new wxStaticText( m_panelGeneral, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 ); m_PadShapeSizeX_Unit->Wrap( -1 ); @@ -122,7 +122,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind m_ShapeSize_Y_Ctrl = new wxTextCtrl( m_panelGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_ShapeSize_Y_Ctrl->SetMaxLength( 0 ); - fgSizerShapeType->Add( m_ShapeSize_Y_Ctrl, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxTOP, 5 ); + fgSizerShapeType->Add( m_ShapeSize_Y_Ctrl, 0, wxEXPAND|wxLEFT|wxTOP, 5 ); m_PadShapeSizeY_Unit = new wxStaticText( m_panelGeneral, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 ); m_PadShapeSizeY_Unit->Wrap( -1 ); @@ -136,7 +136,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind int m_PadOrientNChoices = sizeof( m_PadOrientChoices ) / sizeof( wxString ); m_PadOrient = new wxChoice( m_panelGeneral, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_PadOrientNChoices, m_PadOrientChoices, 0 ); m_PadOrient->SetSelection( 4 ); - fgSizerShapeType->Add( m_PadOrient, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxTOP, 5 ); + fgSizerShapeType->Add( m_PadOrient, 0, wxEXPAND|wxLEFT|wxTOP, 5 ); m_staticText491 = new wxStaticText( m_panelGeneral, wxID_ANY, _("deg"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText491->Wrap( -1 ); @@ -148,7 +148,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind m_PadOrientCtrl = new wxTextCtrl( m_panelGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_PadOrientCtrl->SetMaxLength( 0 ); - fgSizerShapeType->Add( m_PadOrientCtrl, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxTOP, 5 ); + fgSizerShapeType->Add( m_PadOrientCtrl, 0, wxEXPAND|wxLEFT|wxTOP, 5 ); m_customOrientUnits = new wxStaticText( m_panelGeneral, wxID_ANY, _("0.1 deg"), wxDefaultPosition, wxDefaultSize, 0 ); m_customOrientUnits->Wrap( -1 ); @@ -160,7 +160,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind m_ShapeOffset_X_Ctrl = new wxTextCtrl( m_panelGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_ShapeOffset_X_Ctrl->SetMaxLength( 0 ); - fgSizerShapeType->Add( m_ShapeOffset_X_Ctrl, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxTOP, 5 ); + fgSizerShapeType->Add( m_ShapeOffset_X_Ctrl, 0, wxEXPAND|wxLEFT|wxTOP, 5 ); m_PadShapeOffsetX_Unit = new wxStaticText( m_panelGeneral, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 ); m_PadShapeOffsetX_Unit->Wrap( -1 ); @@ -172,7 +172,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind m_ShapeOffset_Y_Ctrl = new wxTextCtrl( m_panelGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_ShapeOffset_Y_Ctrl->SetMaxLength( 0 ); - fgSizerShapeType->Add( m_ShapeOffset_Y_Ctrl, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxTOP, 5 ); + fgSizerShapeType->Add( m_ShapeOffset_Y_Ctrl, 0, wxEXPAND|wxLEFT|wxTOP, 5 ); m_PadShapeOffsetY_Unit = new wxStaticText( m_panelGeneral, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 ); m_PadShapeOffsetY_Unit->Wrap( -1 ); @@ -186,7 +186,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind m_LengthPadToDieCtrl = new wxTextCtrl( m_panelGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_LengthPadToDieCtrl->SetMaxLength( 0 ); - fgSizerShapeType->Add( m_LengthPadToDieCtrl, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxTOP, 5 ); + fgSizerShapeType->Add( m_LengthPadToDieCtrl, 0, wxEXPAND|wxLEFT|wxTOP, 5 ); m_PadLengthDie_Unit = new wxStaticText( m_panelGeneral, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 ); m_PadLengthDie_Unit->Wrap( -1 ); @@ -198,7 +198,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind m_ShapeDelta_Ctrl = new wxTextCtrl( m_panelGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_ShapeDelta_Ctrl->SetMaxLength( 0 ); - fgSizerShapeType->Add( m_ShapeDelta_Ctrl, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxTOP, 5 ); + fgSizerShapeType->Add( m_ShapeDelta_Ctrl, 0, wxEXPAND|wxLEFT|wxTOP, 5 ); m_PadShapeDelta_Unit = new wxStaticText( m_panelGeneral, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 ); m_PadShapeDelta_Unit->Wrap( -1 ); @@ -212,7 +212,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind int m_trapDeltaDirChoiceNChoices = sizeof( m_trapDeltaDirChoiceChoices ) / sizeof( wxString ); m_trapDeltaDirChoice = new wxChoice( m_panelGeneral, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_trapDeltaDirChoiceNChoices, m_trapDeltaDirChoiceChoices, 0 ); m_trapDeltaDirChoice->SetSelection( 0 ); - fgSizerShapeType->Add( m_trapDeltaDirChoice, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxEXPAND|wxLEFT|wxTOP, 5 ); + fgSizerShapeType->Add( m_trapDeltaDirChoice, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxTOP, 5 ); m_staticText521 = new wxStaticText( m_panelGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_staticText521->Wrap( -1 ); @@ -236,7 +236,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind m_staticModuleRotValue = new wxStaticText( m_panelGeneral, wxID_ANY, _("0"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticModuleRotValue->Wrap( -1 ); - fgSizer4->Add( m_staticModuleRotValue, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); + fgSizer4->Add( m_staticModuleRotValue, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); m_staticTitleModuleSide = new wxStaticText( m_panelGeneral, wxID_ANY, _("Board side:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTitleModuleSide->Wrap( -1 ); @@ -244,7 +244,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind m_staticModuleSideValue = new wxStaticText( m_panelGeneral, wxID_ANY, _("Front side"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticModuleSideValue->Wrap( -1 ); - fgSizer4->Add( m_staticModuleSideValue, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); + fgSizer4->Add( m_staticModuleSideValue, 0, wxALL|wxEXPAND, 5 ); sbSizeModuleInfo->Add( fgSizer4, 0, 0, 5 ); @@ -275,7 +275,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind int m_DrillShapeCtrlNChoices = sizeof( m_DrillShapeCtrlChoices ) / sizeof( wxString ); m_DrillShapeCtrl = new wxChoice( m_panelGeneral, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_DrillShapeCtrlNChoices, m_DrillShapeCtrlChoices, 0 ); m_DrillShapeCtrl->SetSelection( 0 ); - fgSizerGeometry->Add( m_DrillShapeCtrl, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxTOP, 5 ); + fgSizerGeometry->Add( m_DrillShapeCtrl, 0, wxEXPAND|wxLEFT|wxTOP, 5 ); m_staticText51 = new wxStaticText( m_panelGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_staticText51->Wrap( -1 ); @@ -287,7 +287,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind m_PadDrill_X_Ctrl = new wxTextCtrl( m_panelGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_PadDrill_X_Ctrl->SetMaxLength( 0 ); - fgSizerGeometry->Add( m_PadDrill_X_Ctrl, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxTOP, 5 ); + fgSizerGeometry->Add( m_PadDrill_X_Ctrl, 0, wxEXPAND|wxLEFT|wxTOP, 5 ); m_PadDrill_X_Unit = new wxStaticText( m_panelGeneral, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 ); m_PadDrill_X_Unit->Wrap( -1 ); @@ -299,7 +299,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind m_PadDrill_Y_Ctrl = new wxTextCtrl( m_panelGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_PadDrill_Y_Ctrl->SetMaxLength( 0 ); - fgSizerGeometry->Add( m_PadDrill_Y_Ctrl, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxEXPAND|wxLEFT|wxTOP, 5 ); + fgSizerGeometry->Add( m_PadDrill_Y_Ctrl, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxTOP, 5 ); m_PadDrill_Y_Unit = new wxStaticText( m_panelGeneral, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 ); m_PadDrill_Y_Unit->Wrap( -1 ); @@ -418,7 +418,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind m_SolderMaskMarginCtrl = new wxTextCtrl( m_localSettingsPanel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_SolderMaskMarginCtrl->SetMaxLength( 0 ); - fgClearancesGridSizer->Add( m_SolderMaskMarginCtrl, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxTOP, 5 ); + fgClearancesGridSizer->Add( m_SolderMaskMarginCtrl, 0, wxEXPAND|wxLEFT|wxTOP, 5 ); m_SolderMaskMarginUnits = new wxStaticText( m_localSettingsPanel, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 ); m_SolderMaskMarginUnits->Wrap( -1 ); @@ -432,7 +432,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind m_SolderPasteMarginCtrl = new wxTextCtrl( m_localSettingsPanel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_SolderPasteMarginCtrl->SetMaxLength( 0 ); - fgClearancesGridSizer->Add( m_SolderPasteMarginCtrl, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxTOP, 5 ); + fgClearancesGridSizer->Add( m_SolderPasteMarginCtrl, 0, wxEXPAND|wxLEFT|wxTOP, 5 ); m_SolderPasteMarginUnits = new wxStaticText( m_localSettingsPanel, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 ); m_SolderPasteMarginUnits->Wrap( -1 ); @@ -446,7 +446,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind m_SolderPasteMarginRatioCtrl = new wxTextCtrl( m_localSettingsPanel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_SolderPasteMarginRatioCtrl->SetMaxLength( 0 ); - fgClearancesGridSizer->Add( m_SolderPasteMarginRatioCtrl, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxEXPAND|wxLEFT|wxTOP, 5 ); + fgClearancesGridSizer->Add( m_SolderPasteMarginRatioCtrl, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxTOP, 5 ); m_SolderPasteRatioMarginUnits = new wxStaticText( m_localSettingsPanel, wxID_ANY, _("%"), wxDefaultPosition, wxDefaultSize, 0 ); m_SolderPasteRatioMarginUnits->Wrap( -1 ); @@ -475,7 +475,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind int m_ZoneConnectionChoiceNChoices = sizeof( m_ZoneConnectionChoiceChoices ) / sizeof( wxString ); m_ZoneConnectionChoice = new wxChoice( m_localSettingsPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_ZoneConnectionChoiceNChoices, m_ZoneConnectionChoiceChoices, 0 ); m_ZoneConnectionChoice->SetSelection( 0 ); - fgSizer41->Add( m_ZoneConnectionChoice, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxEXPAND, 5 ); + fgSizer41->Add( m_ZoneConnectionChoice, 0, wxLEFT|wxTOP|wxEXPAND, 5 ); m_staticText53 = new wxStaticText( m_localSettingsPanel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_staticText53->Wrap( -1 ); @@ -487,7 +487,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind m_ThermalWidthCtrl = new wxTextCtrl( m_localSettingsPanel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_ThermalWidthCtrl->SetMaxLength( 0 ); - fgSizer41->Add( m_ThermalWidthCtrl, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxTOP, 5 ); + fgSizer41->Add( m_ThermalWidthCtrl, 0, wxEXPAND|wxLEFT|wxTOP, 5 ); m_ThermalWidthUnits = new wxStaticText( m_localSettingsPanel, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 ); m_ThermalWidthUnits->Wrap( -1 ); @@ -499,7 +499,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind m_ThermalGapCtrl = new wxTextCtrl( m_localSettingsPanel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_ThermalGapCtrl->SetMaxLength( 0 ); - fgSizer41->Add( m_ThermalGapCtrl, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxEXPAND|wxLEFT|wxTOP, 5 ); + fgSizer41->Add( m_ThermalGapCtrl, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxTOP, 5 ); m_ThermalGapUnits = new wxStaticText( m_localSettingsPanel, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 ); m_ThermalGapUnits->Wrap( -1 ); @@ -550,7 +550,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind m_staticTextWarningPadFlipped->Wrap( -1 ); m_staticTextWarningPadFlipped->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); - m_MainSizer->Add( m_staticTextWarningPadFlipped, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + m_MainSizer->Add( m_staticTextWarningPadFlipped, 0, wxALL, 5 ); m_sdbSizer1 = new wxStdDialogButtonSizer(); m_sdbSizer1OK = new wxButton( this, wxID_OK ); diff --git a/pcbnew/dialogs/dialog_pad_properties_base.fbp b/pcbnew/dialogs/dialog_pad_properties_base.fbp index 39cf87be6a..220498a502 100644 --- a/pcbnew/dialogs/dialog_pad_properties_base.fbp +++ b/pcbnew/dialogs/dialog_pad_properties_base.fbp @@ -377,7 +377,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT|wxTOP + wxEXPAND|wxLEFT|wxRIGHT|wxTOP 0 1 @@ -551,7 +551,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT|wxTOP + wxEXPAND|wxLEFT|wxRIGHT|wxTOP 0 1 @@ -725,7 +725,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT|wxTOP + wxEXPAND|wxLEFT|wxRIGHT|wxTOP 0 1 @@ -896,7 +896,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -1085,7 +1085,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxTOP + wxEXPAND|wxLEFT|wxTOP 0 1 @@ -1342,7 +1342,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxTOP + wxEXPAND|wxLEFT|wxTOP 0 1 @@ -1599,7 +1599,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxTOP + wxEXPAND|wxLEFT|wxTOP 0 1 @@ -1856,7 +1856,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxTOP + wxEXPAND|wxLEFT|wxTOP 0 1 @@ -2113,7 +2113,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxTOP + wxEXPAND|wxLEFT|wxTOP 0 1 @@ -2367,7 +2367,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxTOP + wxEXPAND|wxLEFT|wxTOP 0 1 @@ -2624,7 +2624,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxTOP + wxEXPAND|wxLEFT|wxTOP 0 1 @@ -2881,7 +2881,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxTOP + wxEXPAND|wxLEFT|wxTOP 0 1 @@ -3138,7 +3138,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxTOP + wxEXPAND|wxLEFT|wxTOP 0 1 @@ -3395,7 +3395,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxTOP + wxEXPAND|wxLEFT|wxTOP 0 1 @@ -3652,7 +3652,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxEXPAND|wxLEFT|wxTOP + wxBOTTOM|wxEXPAND|wxLEFT|wxTOP 0 1 @@ -3936,7 +3936,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT|wxTOP + wxEXPAND|wxLEFT|wxRIGHT|wxTOP 0 1 @@ -4102,7 +4102,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -4311,7 +4311,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxTOP + wxEXPAND|wxLEFT|wxTOP 0 1 @@ -4565,7 +4565,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxTOP + wxEXPAND|wxLEFT|wxTOP 0 1 @@ -4822,7 +4822,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxEXPAND|wxLEFT|wxTOP + wxBOTTOM|wxEXPAND|wxLEFT|wxTOP 0 1 @@ -6643,7 +6643,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxTOP + wxEXPAND|wxLEFT|wxTOP 0 1 @@ -6900,7 +6900,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxTOP + wxEXPAND|wxLEFT|wxTOP 0 1 @@ -7157,7 +7157,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxEXPAND|wxLEFT|wxTOP + wxBOTTOM|wxEXPAND|wxLEFT|wxTOP 0 1 @@ -7446,7 +7446,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxEXPAND + wxLEFT|wxTOP|wxEXPAND 0 1 @@ -7700,7 +7700,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxTOP + wxEXPAND|wxLEFT|wxTOP 0 1 @@ -7957,7 +7957,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxEXPAND|wxLEFT|wxTOP + wxBOTTOM|wxEXPAND|wxLEFT|wxTOP 0 1 @@ -8403,7 +8403,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALL + wxALL 0 1 diff --git a/pcbnew/dialogs/dialog_pad_properties_base.h b/pcbnew/dialogs/dialog_pad_properties_base.h index 7a2cca8b57..0c24ca0afc 100644 --- a/pcbnew/dialogs/dialog_pad_properties_base.h +++ b/pcbnew/dialogs/dialog_pad_properties_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! diff --git a/pcbnew/dialogs/dialog_plot_base.cpp b/pcbnew/dialogs/dialog_plot_base.cpp index a5134b39c7..84f078bf0a 100644 --- a/pcbnew/dialogs/dialog_plot_base.cpp +++ b/pcbnew/dialogs/dialog_plot_base.cpp @@ -51,7 +51,7 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr m_outputDirectoryName->SetMaxLength( 0 ); m_outputDirectoryName->SetToolTip( _("Target directory for plot files. Can be absolute or relative to the board file location.") ); - bSizer29->Add( m_outputDirectoryName, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 ); + bSizer29->Add( m_outputDirectoryName, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 ); m_browseButton = new wxButton( this, wxID_ANY, _("Browse..."), wxDefaultPosition, wxDefaultSize, 0 ); bSizer29->Add( m_browseButton, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); @@ -249,7 +249,7 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr m_rbGerberFormat->SetSelection( 0 ); m_rbGerberFormat->SetToolTip( _("Resolution of coordinates in Gerber files.\nUse the higher value if possible.") ); - m_GerberOptionsSizer->Add( m_rbGerberFormat, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + m_GerberOptionsSizer->Add( m_rbGerberFormat, 1, wxEXPAND|wxALL, 5 ); m_PlotOptionsSizer->Add( m_GerberOptionsSizer, 0, wxALL|wxEXPAND, 3 ); diff --git a/pcbnew/dialogs/dialog_plot_base.fbp b/pcbnew/dialogs/dialog_plot_base.fbp index 5363d9cd7f..3a0c9933aa 100644 --- a/pcbnew/dialogs/dialog_plot_base.fbp +++ b/pcbnew/dialogs/dialog_plot_base.fbp @@ -396,7 +396,7 @@ none 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT + wxEXPAND|wxRIGHT|wxLEFT 1 1 @@ -2967,7 +2967,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL + wxEXPAND|wxALL 1 1 diff --git a/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp b/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp index 8073b942b7..d6a0104f42 100644 --- a/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp +++ b/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -32,7 +32,7 @@ DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE::DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE( wxArrayString m_choicePathFromChoices; m_choicePathFrom = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choicePathFromChoices, 0 ); m_choicePathFrom->SetSelection( 0 ); - fgSizerLenSkew->Add( m_choicePathFrom, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + fgSizerLenSkew->Add( m_choicePathFrom, 0, wxALL|wxEXPAND, 5 ); fgSizerLenSkew->Add( 0, 0, 0, 0, 5 ); @@ -59,7 +59,7 @@ DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE::DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE( m_constraintSource->SetSelection( 1 ); m_constraintSource->Enable( false ); - fgSizerLenSkew->Add( m_constraintSource, 1, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + fgSizerLenSkew->Add( m_constraintSource, 1, wxALL|wxEXPAND, 5 ); fgSizerLenSkew->Add( 0, 0, 0, 0, 5 ); @@ -69,7 +69,7 @@ DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE::DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE( fgSizerLenSkew->Add( m_targetLengthLabel, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); m_targetLengthText = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerLenSkew->Add( m_targetLengthText, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + fgSizerLenSkew->Add( m_targetLengthText, 0, wxALL|wxEXPAND, 5 ); m_targetLengthUnit = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_targetLengthUnit->Wrap( -1 ); @@ -98,7 +98,7 @@ DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE::DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE( fgSizer3->Add( m_staticText9, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); m_minAmplText = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer3->Add( m_minAmplText, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + fgSizer3->Add( m_minAmplText, 0, wxALL|wxEXPAND, 5 ); m_minAmplUnit = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_minAmplUnit->Wrap( -1 ); @@ -109,7 +109,7 @@ DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE::DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE( fgSizer3->Add( m_staticText91, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); m_maxAmplText = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer3->Add( m_maxAmplText, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + fgSizer3->Add( m_maxAmplText, 0, wxALL|wxEXPAND, 5 ); m_maxAmplUnit = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_maxAmplUnit->Wrap( -1 ); @@ -120,7 +120,7 @@ DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE::DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE( fgSizer3->Add( m_staticText11, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); m_spacingText = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer3->Add( m_spacingText, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + fgSizer3->Add( m_spacingText, 0, wxALL|wxEXPAND, 5 ); m_spacingUnit = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_spacingUnit->Wrap( -1 ); @@ -131,7 +131,7 @@ DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE::DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE( fgSizer3->Add( m_staticText13, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); m_radiusText = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer3->Add( m_radiusText, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + fgSizer3->Add( m_radiusText, 0, wxALL|wxEXPAND, 5 ); m_radiusUnit = new wxStaticText( this, wxID_ANY, _("%"), wxDefaultPosition, wxDefaultSize, 0 ); m_radiusUnit->Wrap( -1 ); @@ -149,7 +149,7 @@ DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE::DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE( m_miterStyle->SetSelection( 0 ); m_miterStyle->Enable( false ); - fgSizer3->Add( m_miterStyle, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + fgSizer3->Add( m_miterStyle, 0, wxALL|wxEXPAND, 5 ); sbSizer2->Add( fgSizer3, 1, wxEXPAND, 5 ); diff --git a/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.fbp b/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.fbp index 1ce4531ad6..367f0ed40f 100644 --- a/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.fbp +++ b/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.fbp @@ -206,7 +206,7 @@ 5 - wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -568,7 +568,7 @@ 5 - wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND + wxALL|wxEXPAND 1 1 @@ -749,7 +749,7 @@ 5 - wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -1119,7 +1119,7 @@ 5 - wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -1376,7 +1376,7 @@ 5 - wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -1633,7 +1633,7 @@ 5 - wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -1890,7 +1890,7 @@ 5 - wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -2147,7 +2147,7 @@ 5 - wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND + wxALL|wxEXPAND 0 1 diff --git a/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.h b/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.h index d29afc88d6..a4c73f476a 100644 --- a/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.h +++ b/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! diff --git a/pcbnew/dialogs/dialog_print_for_modedit_base.cpp b/pcbnew/dialogs/dialog_print_for_modedit_base.cpp index 54897d6bfb..84e460874a 100644 --- a/pcbnew/dialogs/dialog_print_for_modedit_base.cpp +++ b/pcbnew/dialogs/dialog_print_for_modedit_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 8 2012) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -46,16 +46,16 @@ DIALOG_PRINT_FOR_MODEDIT_BASE::DIALOG_PRINT_FOR_MODEDIT_BASE( wxWindow* parent, bbuttonsSizer = new wxBoxSizer( wxVERTICAL ); m_buttonOption = new wxButton( this, wxID_PRINT_OPTIONS, _("Page Options"), wxDefaultPosition, wxDefaultSize, 0 ); - bbuttonsSizer->Add( m_buttonOption, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); + bbuttonsSizer->Add( m_buttonOption, 0, wxALL|wxEXPAND, 5 ); m_buttonPreview = new wxButton( this, wxID_PREVIEW, _("Preview"), wxDefaultPosition, wxDefaultSize, 0 ); - bbuttonsSizer->Add( m_buttonPreview, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); + bbuttonsSizer->Add( m_buttonPreview, 0, wxALL|wxEXPAND, 5 ); m_buttonPrint = new wxButton( this, wxID_PRINT_ALL, _("Print"), wxDefaultPosition, wxDefaultSize, 0 ); - bbuttonsSizer->Add( m_buttonPrint, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); + bbuttonsSizer->Add( m_buttonPrint, 0, wxALL|wxEXPAND, 5 ); m_buttonQuit = new wxButton( this, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 ); - bbuttonsSizer->Add( m_buttonQuit, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); + bbuttonsSizer->Add( m_buttonQuit, 0, wxALL|wxEXPAND, 5 ); bMainSizer->Add( bbuttonsSizer, 0, 0, 5 ); diff --git a/pcbnew/dialogs/dialog_print_for_modedit_base.fbp b/pcbnew/dialogs/dialog_print_for_modedit_base.fbp index 8a32a45f93..c0a65bef1c 100644 --- a/pcbnew/dialogs/dialog_print_for_modedit_base.fbp +++ b/pcbnew/dialogs/dialog_print_for_modedit_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -20,8 +20,10 @@ . 1 + 1 1 1 + UI 1 0 @@ -304,7 +306,7 @@ none 5 - wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -392,7 +394,7 @@ 5 - wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -480,7 +482,7 @@ 5 - wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -568,7 +570,7 @@ 5 - wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND + wxALL|wxEXPAND 0 1 diff --git a/pcbnew/dialogs/dialog_print_for_modedit_base.h b/pcbnew/dialogs/dialog_print_for_modedit_base.h index 642c1750b7..3b8387d8a1 100644 --- a/pcbnew/dialogs/dialog_print_for_modedit_base.h +++ b/pcbnew/dialogs/dialog_print_for_modedit_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 8 2012) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! diff --git a/pcbnew/dialogs/dialog_print_using_printer_base.cpp b/pcbnew/dialogs/dialog_print_using_printer_base.cpp index 8ce17dfddc..f5eceb0eeb 100644 --- a/pcbnew/dialogs/dialog_print_using_printer_base.cpp +++ b/pcbnew/dialogs/dialog_print_using_printer_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Mar 19 2012) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -57,6 +57,7 @@ DIALOG_PRINT_USING_PRINTER_base::DIALOG_PRINT_USING_PRINTER_base( wxWindow* pare bmiddleLeftSizer->Add( m_FineAdjustXscaleTitle, 0, wxRIGHT|wxLEFT, 5 ); m_FineAdjustXscaleOpt = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_FineAdjustXscaleOpt->SetMaxLength( 0 ); m_FineAdjustXscaleOpt->SetToolTip( _("Set X scale adjust for exact scale plotting") ); bmiddleLeftSizer->Add( m_FineAdjustXscaleOpt, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); @@ -66,6 +67,7 @@ DIALOG_PRINT_USING_PRINTER_base::DIALOG_PRINT_USING_PRINTER_base( wxWindow* pare bmiddleLeftSizer->Add( m_FineAdjustYscaleTitle, 0, wxRIGHT|wxLEFT, 5 ); m_FineAdjustYscaleOpt = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_FineAdjustYscaleOpt->SetMaxLength( 0 ); m_FineAdjustYscaleOpt->SetToolTip( _("Set Y scale adjust for exact scale plotting") ); bmiddleLeftSizer->Add( m_FineAdjustYscaleOpt, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); @@ -86,6 +88,7 @@ DIALOG_PRINT_USING_PRINTER_base::DIALOG_PRINT_USING_PRINTER_base( wxWindow* pare sbOptionsSizer->Add( m_TextPenWidth, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); m_DialogPenWidth = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_DialogPenWidth->SetMaxLength( 0 ); sbOptionsSizer->Add( m_DialogPenWidth, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); m_Print_Sheet_Ref = new wxCheckBox( this, wxID_FRAME_SEL, _("Print frame ref"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -130,23 +133,23 @@ DIALOG_PRINT_USING_PRINTER_base::DIALOG_PRINT_USING_PRINTER_base( wxWindow* pare bbuttonsSizer->Add( 0, 0, 1, wxEXPAND, 5 ); m_buttonOption = new wxButton( this, wxID_PRINT_OPTIONS, _("Page Options"), wxDefaultPosition, wxDefaultSize, 0 ); - bbuttonsSizer->Add( m_buttonOption, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); + bbuttonsSizer->Add( m_buttonOption, 0, wxALL|wxEXPAND, 5 ); m_buttonPreview = new wxButton( this, wxID_PREVIEW, _("Preview"), wxDefaultPosition, wxDefaultSize, 0 ); - bbuttonsSizer->Add( m_buttonPreview, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); + bbuttonsSizer->Add( m_buttonPreview, 0, wxALL|wxEXPAND, 5 ); m_buttonPrint = new wxButton( this, wxID_PRINT_ALL, _("Print"), wxDefaultPosition, wxDefaultSize, 0 ); - bbuttonsSizer->Add( m_buttonPrint, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); + bbuttonsSizer->Add( m_buttonPrint, 0, wxALL|wxEXPAND, 5 ); m_buttonQuit = new wxButton( this, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 ); m_buttonQuit->SetDefault(); - bbuttonsSizer->Add( m_buttonQuit, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); + bbuttonsSizer->Add( m_buttonQuit, 0, wxALL|wxEXPAND, 5 ); bbuttonsSizer->Add( 0, 0, 1, wxEXPAND, 5 ); - bMainSizer->Add( bbuttonsSizer, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + bMainSizer->Add( bbuttonsSizer, 0, wxEXPAND, 5 ); this->SetSizer( bMainSizer ); diff --git a/pcbnew/dialogs/dialog_print_using_printer_base.fbp b/pcbnew/dialogs/dialog_print_using_printer_base.fbp index c0608efb8f..d817f7d4cb 100644 --- a/pcbnew/dialogs/dialog_print_using_printer_base.fbp +++ b/pcbnew/dialogs/dialog_print_using_printer_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -20,8 +20,10 @@ . 1 + 1 1 1 + UI 1 0 @@ -1238,7 +1240,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND + wxEXPAND 0 @@ -1347,7 +1349,7 @@ 5 - wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -1435,7 +1437,7 @@ 5 - wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -1523,7 +1525,7 @@ 5 - wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -1611,7 +1613,7 @@ 5 - wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND + wxALL|wxEXPAND 0 1 diff --git a/pcbnew/dialogs/dialog_print_using_printer_base.h b/pcbnew/dialogs/dialog_print_using_printer_base.h index 0d6d810ddd..2748dcb7a2 100644 --- a/pcbnew/dialogs/dialog_print_using_printer_base.h +++ b/pcbnew/dialogs/dialog_print_using_printer_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Mar 19 2012) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -11,6 +11,8 @@ #include #include #include +class DIALOG_SHIM; + #include "dialog_shim.h" #include #include diff --git a/pcbnew/dialogs/dialog_set_grid_base.cpp b/pcbnew/dialogs/dialog_set_grid_base.cpp index 9f1207820a..1792e504e4 100644 --- a/pcbnew/dialogs/dialog_set_grid_base.cpp +++ b/pcbnew/dialogs/dialog_set_grid_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Mar 13 2015) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -74,7 +74,7 @@ DIALOG_SET_GRID_BASE::DIALOG_SET_GRID_BASE( wxWindow* parent, wxWindowID id, con m_GridOriginXCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_GridOriginXCtrl->SetMaxLength( 0 ); - fgSizerGridOrigin->Add( m_GridOriginXCtrl, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxTOP, 5 ); + fgSizerGridOrigin->Add( m_GridOriginXCtrl, 0, wxEXPAND|wxLEFT|wxTOP, 5 ); m_TextPosXUnits = new wxStaticText( this, wxID_ANY, _("Inches"), wxDefaultPosition, wxDefaultSize, 0 ); m_TextPosXUnits->Wrap( -1 ); @@ -86,7 +86,7 @@ DIALOG_SET_GRID_BASE::DIALOG_SET_GRID_BASE( wxWindow* parent, wxWindowID id, con m_GridOriginYCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_GridOriginYCtrl->SetMaxLength( 0 ); - fgSizerGridOrigin->Add( m_GridOriginYCtrl, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxEXPAND|wxLEFT|wxTOP, 5 ); + fgSizerGridOrigin->Add( m_GridOriginYCtrl, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxTOP, 5 ); m_TextPosYUnits = new wxStaticText( this, wxID_ANY, _("Inches"), wxDefaultPosition, wxDefaultSize, 0 ); m_TextPosYUnits->Wrap( -1 ); @@ -115,14 +115,14 @@ DIALOG_SET_GRID_BASE::DIALOG_SET_GRID_BASE( wxWindow* parent, wxWindowID id, con fgSizer3->Add( m_staticTextGrid1, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT|wxTOP, 5 ); m_comboBoxGrid1 = new wxComboBox( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY ); - fgSizer3->Add( m_comboBoxGrid1, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); + fgSizer3->Add( m_comboBoxGrid1, 1, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); m_staticTextGrid2 = new wxStaticText( this, wxID_ANY, _("Grid 2:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextGrid2->Wrap( -1 ); fgSizer3->Add( m_staticTextGrid2, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxBOTTOM|wxLEFT|wxTOP, 5 ); m_comboBoxGrid2 = new wxComboBox( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY ); - fgSizer3->Add( m_comboBoxGrid2, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); + fgSizer3->Add( m_comboBoxGrid2, 1, wxALL|wxEXPAND, 5 ); sbSizer4->Add( fgSizer3, 1, wxALL|wxEXPAND, 5 ); diff --git a/pcbnew/dialogs/dialog_set_grid_base.fbp b/pcbnew/dialogs/dialog_set_grid_base.fbp index 0679f75ab6..d27d6c167f 100644 --- a/pcbnew/dialogs/dialog_set_grid_base.fbp +++ b/pcbnew/dialogs/dialog_set_grid_base.fbp @@ -694,7 +694,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxTOP + wxEXPAND|wxLEFT|wxTOP 0 1 @@ -951,7 +951,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxEXPAND|wxLEFT|wxTOP + wxBOTTOM|wxEXPAND|wxLEFT|wxTOP 0 1 @@ -1328,7 +1328,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT|wxTOP + wxEXPAND|wxLEFT|wxRIGHT|wxTOP 1 1 @@ -1502,7 +1502,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + wxALL|wxEXPAND 1 1 diff --git a/pcbnew/dialogs/dialog_set_grid_base.h b/pcbnew/dialogs/dialog_set_grid_base.h index 32a92c29ed..4975430076 100644 --- a/pcbnew/dialogs/dialog_set_grid_base.h +++ b/pcbnew/dialogs/dialog_set_grid_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Mar 13 2015) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! diff --git a/pcbnew/dialogs/dialog_target_properties_base.cpp b/pcbnew/dialogs/dialog_target_properties_base.cpp index 059a3303c0..1f76596afd 100644 --- a/pcbnew/dialogs/dialog_target_properties_base.cpp +++ b/pcbnew/dialogs/dialog_target_properties_base.cpp @@ -30,7 +30,7 @@ TARGET_PROPERTIES_DIALOG_EDITOR_BASE::TARGET_PROPERTIES_DIALOG_EDITOR_BASE( wxWi fgSizer->Add( m_staticTextSize, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); m_TargetSizeCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer->Add( m_TargetSizeCtrl, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizer->Add( m_TargetSizeCtrl, 0, wxALL|wxEXPAND, 5 ); m_staticTextSizeUnits = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextSizeUnits->Wrap( -1 ); @@ -41,7 +41,7 @@ TARGET_PROPERTIES_DIALOG_EDITOR_BASE::TARGET_PROPERTIES_DIALOG_EDITOR_BASE( wxWi fgSizer->Add( m_staticTextThickness, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); m_TargetThicknessCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer->Add( m_TargetThicknessCtrl, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + fgSizer->Add( m_TargetThicknessCtrl, 0, wxEXPAND|wxALL, 5 ); m_staticTextThicknessUnits = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextThicknessUnits->Wrap( -1 ); @@ -55,10 +55,10 @@ TARGET_PROPERTIES_DIALOG_EDITOR_BASE::TARGET_PROPERTIES_DIALOG_EDITOR_BASE( wxWi int m_TargetShapeNChoices = sizeof( m_TargetShapeChoices ) / sizeof( wxString ); m_TargetShape = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_TargetShapeNChoices, m_TargetShapeChoices, 0 ); m_TargetShape->SetSelection( 0 ); - fgSizer->Add( m_TargetShape, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizer->Add( m_TargetShape, 0, wxALL|wxEXPAND, 5 ); - fgSizer->Add( 0, 0, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizer->Add( 0, 0, 1, wxEXPAND, 5 ); bSizerUpper->Add( fgSizer, 1, wxEXPAND, 5 ); @@ -76,7 +76,7 @@ TARGET_PROPERTIES_DIALOG_EDITOR_BASE::TARGET_PROPERTIES_DIALOG_EDITOR_BASE( wxWi m_sdbSizerButts->AddButton( m_sdbSizerButtsCancel ); m_sdbSizerButts->Realize(); - bSizerMain->Add( m_sdbSizerButts, 0, wxALIGN_RIGHT|wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); + bSizerMain->Add( m_sdbSizerButts, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); this->SetSizer( bSizerMain ); diff --git a/pcbnew/dialogs/dialog_target_properties_base.fbp b/pcbnew/dialogs/dialog_target_properties_base.fbp index 49d41791e3..ec4795c64c 100644 --- a/pcbnew/dialogs/dialog_target_properties_base.fbp +++ b/pcbnew/dialogs/dialog_target_properties_base.fbp @@ -203,7 +203,7 @@ 5 - wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL + wxALL|wxEXPAND 0 1 @@ -460,7 +460,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL + wxEXPAND|wxALL 0 1 @@ -717,7 +717,7 @@ 5 - wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL + wxALL|wxEXPAND 0 1 @@ -805,7 +805,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL + wxEXPAND 1 0 @@ -900,7 +900,7 @@ 5 - wxALIGN_RIGHT|wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT 0 0 diff --git a/pcbnew/dialogs/dialog_track_via_size_base.cpp b/pcbnew/dialogs/dialog_track_via_size_base.cpp index 25d5f27377..759d143b16 100644 --- a/pcbnew/dialogs/dialog_track_via_size_base.cpp +++ b/pcbnew/dialogs/dialog_track_via_size_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -27,7 +27,7 @@ DIALOG_TRACK_VIA_SIZE_BASE::DIALOG_TRACK_VIA_SIZE_BASE( wxWindow* parent, wxWind fgSizer1->Add( m_staticText3, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); m_trackWidthText = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer1->Add( m_trackWidthText, 1, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + fgSizer1->Add( m_trackWidthText, 1, wxALL|wxEXPAND, 5 ); m_trackWidthLabel = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_trackWidthLabel->Wrap( -1 ); diff --git a/pcbnew/dialogs/dialog_track_via_size_base.fbp b/pcbnew/dialogs/dialog_track_via_size_base.fbp index 1c7872478e..28dcad120e 100644 --- a/pcbnew/dialogs/dialog_track_via_size_base.fbp +++ b/pcbnew/dialogs/dialog_track_via_size_base.fbp @@ -194,7 +194,7 @@ 5 - wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND + wxALL|wxEXPAND 1 1 diff --git a/pcbnew/dialogs/dialog_track_via_size_base.h b/pcbnew/dialogs/dialog_track_via_size_base.h index f64b6fb487..8e07506e63 100644 --- a/pcbnew/dialogs/dialog_track_via_size_base.h +++ b/pcbnew/dialogs/dialog_track_via_size_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2014) +// C++ code generated with wxFormBuilder (version Mar 9 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE!