From 3db19ba2eb7dc65c038887abf1ca5a80afe3e459 Mon Sep 17 00:00:00 2001 From: Dick Hollenbeck Date: Mon, 8 Oct 2012 14:34:04 -0500 Subject: [PATCH] eeschema erc dialog extends from DIALOG_SHIM --- eeschema/dialogs/dialog_erc_base.cpp | 21 +- eeschema/dialogs/dialog_erc_base.fbp | 3056 ++++++++++++++++---------- eeschema/dialogs/dialog_erc_base.h | 32 +- eeschema/hotkeys.cpp | 14 +- eeschema/schedit.cpp | 2 +- eeschema/template_fieldnames.cpp | 4 +- pcbnew/files.cpp | 1 + 7 files changed, 1911 insertions(+), 1219 deletions(-) diff --git a/eeschema/dialogs/dialog_erc_base.cpp b/eeschema/dialogs/dialog_erc_base.cpp index e78f52858a..d6df7948ad 100644 --- a/eeschema/dialogs/dialog_erc_base.cpp +++ b/eeschema/dialogs/dialog_erc_base.cpp @@ -1,17 +1,15 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 16 2008) +// C++ code generated with wxFormBuilder (version Apr 11 2012) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#include "dialog_erc_listbox.h" - #include "dialog_erc_base.h" /////////////////////////////////////////////////////////////////////////// -BEGIN_EVENT_TABLE( DIALOG_ERC_BASE, wxDialog ) +BEGIN_EVENT_TABLE( DIALOG_ERC_BASE, DIALOG_SHIM ) EVT_BUTTON( ID_ERC_CMP, DIALOG_ERC_BASE::_wxFB_OnErcCmpClick ) EVT_BUTTON( ID_ERASE_DRC_MARKERS, DIALOG_ERC_BASE::_wxFB_OnEraseDrcMarkersClick ) EVT_BUTTON( wxID_CANCEL, DIALOG_ERC_BASE::_wxFB_OnCancelClick ) @@ -19,7 +17,7 @@ BEGIN_EVENT_TABLE( DIALOG_ERC_BASE, wxDialog ) EVT_BUTTON( ID_RESET_MATRIX, DIALOG_ERC_BASE::_wxFB_OnResetMatrixClick ) END_EVENT_TABLE() -DIALOG_ERC_BASE::DIALOG_ERC_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) +DIALOG_ERC_BASE::DIALOG_ERC_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) { this->SetSizeHints( wxDefaultSize, wxDefaultSize ); @@ -64,9 +62,11 @@ DIALOG_ERC_BASE::DIALOG_ERC_BASE( wxWindow* parent, wxWindowID id, const wxStrin m_LastErrCount->Wrap( -1 ); gSizer1->Add( m_LastErrCount, 0, wxALL, 5 ); + sdiagSizer->Add( gSizer1, 0, 0, 5 ); - bupperSizer->Add( sdiagSizer, 0, 0, 5 ); + + bupperSizer->Add( sdiagSizer, 0, wxALIGN_CENTER_VERTICAL, 5 ); wxBoxSizer* bSizeMessages; bSizeMessages = new wxBoxSizer( wxVERTICAL ); @@ -80,6 +80,7 @@ DIALOG_ERC_BASE::DIALOG_ERC_BASE( wxWindow* parent, wxWindowID id, const wxStrin bSizeMessages->Add( m_MessagesList, 1, wxEXPAND|wxBOTTOM|wxLEFT, 5 ); + bupperSizer->Add( bSizeMessages, 1, wxEXPAND, 5 ); wxBoxSizer* bbuttonsSizer; @@ -94,12 +95,13 @@ DIALOG_ERC_BASE::DIALOG_ERC_BASE( wxWindow* parent, wxWindowID id, const wxStrin m_buttonClose = new wxButton( m_PanelERC, wxID_CANCEL, _("&Close"), wxDefaultPosition, wxDefaultSize, 0 ); bbuttonsSizer->Add( m_buttonClose, 0, wxALL|wxEXPAND, 5 ); + bupperSizer->Add( bbuttonsSizer, 0, wxALIGN_CENTER_VERTICAL, 5 ); + bercSizer->Add( bupperSizer, 0, wxEXPAND, 5 ); m_WriteResultOpt = new wxCheckBox( m_PanelERC, wxID_ANY, _("Create ERC report"), wxDefaultPosition, wxDefaultSize, 0 ); - bercSizer->Add( m_WriteResultOpt, 0, wxALL, 5 ); m_staticline2 = new wxStaticLine( m_PanelERC, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); @@ -114,6 +116,7 @@ DIALOG_ERC_BASE::DIALOG_ERC_BASE( wxWindow* parent, wxWindowID id, const wxStrin bercSizer->Add( m_MarkersList, 1, wxALL|wxEXPAND, 5 ); + m_PanelERC->SetSizer( bercSizer ); m_PanelERC->Layout(); bercSizer->Fit( m_PanelERC ); @@ -129,8 +132,10 @@ DIALOG_ERC_BASE::DIALOG_ERC_BASE( wxWindow* parent, wxWindowID id, const wxStrin m_MatrixSizer = new wxBoxSizer( wxVERTICAL ); + m_PanelMatrixSizer->Add( m_MatrixSizer, 1, wxEXPAND, 5 ); + m_PanelERCOptions->SetSizer( m_PanelMatrixSizer ); m_PanelERCOptions->Layout(); m_PanelMatrixSizer->Fit( m_PanelERCOptions ); @@ -138,8 +143,10 @@ DIALOG_ERC_BASE::DIALOG_ERC_BASE( wxWindow* parent, wxWindowID id, const wxStrin bSizer1->Add( m_NoteBook, 1, wxEXPAND | wxALL, 5 ); + this->SetSizer( bSizer1 ); this->Layout(); + bSizer1->Fit( this ); } DIALOG_ERC_BASE::~DIALOG_ERC_BASE() diff --git a/eeschema/dialogs/dialog_erc_base.fbp b/eeschema/dialogs/dialog_erc_base.fbp index 805e6d176d..e7360ad261 100644 --- a/eeschema/dialogs/dialog_erc_base.fbp +++ b/eeschema/dialogs/dialog_erc_base.fbp @@ -1,1186 +1,1870 @@ - - - - - - C++ - 1 - UTF-8 - table - dialog_erc_base - 1000 - none - 1 - dialog_ERC_base - - . - - 0 - 1 - 0 - - - - - 1 - - - - 0 - wxID_ANY - - - DIALOG_ERC_BASE - - 496,407 - wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - ; - EESchema Erc - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer1 - wxVERTICAL - none - - 5 - wxEXPAND | wxALL - 1 - - - - - 1 - - - 0 - wxID_ANY - - - m_NoteBook - protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ERC - 1 - - - - 1 - - - 0 - wxID_ANY - - - m_PanelERC - protected - - - - - - - wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - bercSizer - wxVERTICAL - none - - 5 - wxEXPAND - 0 - - - bupperSizer - wxHORIZONTAL - none - - 5 - wxALIGN_CENTER_VERTICAL - 0 - - wxID_ANY - Erc File Report: - - sdiagSizer - wxVERTICAL - none - - - 5 - - 0 - - 2 - 0 - - gSizer1 - none - 3 - 0 - - 5 - wxALL - 0 - - - - 1 - - - 0 - wxID_ANY - Total Errors Count: - - - m_ErcTotalErrorsText - protected - - - wxALIGN_RIGHT - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL - 0 - - - - 1 - - - 0 - wxID_ANY - 0000 - - - m_TotalErrCount - protected - - - - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL - 0 - - - - 1 - - - 0 - wxID_ANY - Warnings Count: - - - m_WarnErcErrorsText - protected - - - wxALIGN_RIGHT - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL - 0 - - - - 1 - - - 0 - wxID_ANY - 0000 - - - m_LastWarningCount - protected - - - - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL - 0 - - - - 1 - - - 0 - wxID_ANY - Errors Count: - - - m_LastErrCountText - protected - - - wxALIGN_RIGHT - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL - 0 - - - - 1 - - - 0 - wxID_ANY - 0000 - - - m_LastErrCount - protected - - - - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - - bSizeMessages - wxVERTICAL - none - - 5 - wxRIGHT|wxLEFT - 0 - - - - 1 - - - 0 - wxID_ANY - Messages: - - - m_titleMessages - protected - - - - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxBOTTOM|wxLEFT - 1 - - - - 1 - - - 0 - wxID_ANY - - 0 - 300,-1 - m_MessagesList - protected - - - wxTE_MULTILINE|wxTE_READONLY - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL - 0 - - - bbuttonsSizer - wxVERTICAL - none - - 5 - wxALL|wxEXPAND - 0 - - - - 0 - 1 - - - 0 - ID_ERC_CMP - &Test Erc - - - m_buttonERC - protected - - - - - - - - - OnErcCmpClick - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxEXPAND - 0 - - - - 0 - 1 - - - 0 - ID_ERASE_DRC_MARKERS - &Del Markers - - - m_buttondelmarkers - protected - - - - - - - - - OnEraseDrcMarkersClick - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxEXPAND - 0 - - - - 0 - 1 - - - 0 - wxID_CANCEL - &Close - - - m_buttonClose - protected - - - - - - - - - OnCancelClick - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL - 0 - - - 0 - - 1 - - - 0 - wxID_ANY - Create ERC report - - - m_WriteResultOpt - protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND | wxALL - 0 - - - - 1 - - - 0 - wxID_ANY - - - m_staticline2 - protected - - - wxLI_HORIZONTAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxTOP|wxRIGHT|wxLEFT - 0 - - - - 1 - - - 0 - wxID_ANY - Markers: - - - m_textMarkers - protected - - - - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxEXPAND - 1 - - - - - 1 - - - 0 - ID_MAKER_HTMLLISTBOX - - 500,350 - m_MarkersList - protected - - - - ERC_HTML_LISTBOX; dialog_erc_listbox.h - - - - wxSIMPLE_BORDER - - - - - - - - - - - - OnLeftDClickMarkersList - - - - - - - - - - - - - - - - - - - - - Options - 0 - - - - 1 - - - 0 - wxID_ANY - - - m_PanelERCOptions - protected - - - - - - - wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - m_PanelMatrixSizer - wxVERTICAL - protected - - 5 - wxALL - 0 - - - - 0 - 1 - - - 0 - ID_RESET_MATRIX - Reset - - - m_ResetOptButton - protected - - - - - - - - - OnResetMatrixClick - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND | wxALL - 0 - - - - 1 - - - 0 - wxID_ANY - - - m_staticline1 - protected - - - wxLI_HORIZONTAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - - m_MatrixSizer - wxVERTICAL - protected - - - - - - - - - - - + + + + + + C++ + 1 + source_name + 0 + 0 + res + UTF-8 + table + dialog_erc_base + 1000 + none + 1 + dialog_ERC_base + + . + + 0 + 1 + 1 + 1 + 0 + + 0 + wxAUI_MGR_DEFAULT + + + + 1 + 1 + impl_virtual + + + + 0 + wxID_ANY + + + DIALOG_ERC_BASE + + -1,-1 + wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER + DIALOG_SHIM; dialog_shim.h + EESchema Erc + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + bSizer1 + wxVERTICAL + none + + 5 + wxEXPAND | wxALL + 1 + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_NoteBook + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ERC + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_PanelERC + 1 + + + protected + 1 + + Resizable + 1 + + + 0 + + + + wxTAB_TRAVERSAL + + + + + + + + + + + + + + + + + + + + + + + + + + bercSizer + wxVERTICAL + none + + 5 + wxEXPAND + 0 + + + bupperSizer + wxHORIZONTAL + none + + 5 + wxALIGN_CENTER_VERTICAL + 0 + + wxID_ANY + Erc File Report: + + sdiagSizer + wxVERTICAL + none + + + 5 + + 0 + + 2 + 0 + + gSizer1 + none + 3 + 0 + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Total Errors Count: + + 0 + + + 0 + + 1 + m_ErcTotalErrorsText + 1 + + + protected + 1 + + Resizable + 1 + + wxALIGN_RIGHT + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + 0000 + + 0 + + + 0 + + 1 + m_TotalErrCount + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Warnings Count: + + 0 + + + 0 + + 1 + m_WarnErcErrorsText + 1 + + + protected + 1 + + Resizable + 1 + + wxALIGN_RIGHT + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + 0000 + + 0 + + + 0 + + 1 + m_LastWarningCount + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Errors Count: + + 0 + + + 0 + + 1 + m_LastErrCountText + 1 + + + protected + 1 + + Resizable + 1 + + wxALIGN_RIGHT + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + 0000 + + 0 + + + 0 + + 1 + m_LastErrCount + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + + bSizeMessages + wxVERTICAL + none + + 5 + wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Messages: + + 0 + + + 0 + + 1 + m_titleMessages + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxBOTTOM|wxLEFT + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + 300,-1 + 1 + m_MessagesList + 1 + + + protected + 1 + + Resizable + 1 + + wxTE_MULTILINE|wxTE_READONLY + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL + 0 + + + bbuttonsSizer + wxVERTICAL + none + + 5 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_ERC_CMP + &Test Erc + + 0 + + + 0 + + 1 + m_buttonERC + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnErcCmpClick + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_ERASE_DRC_MARKERS + &Del Markers + + 0 + + + 0 + + 1 + m_buttondelmarkers + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnEraseDrcMarkersClick + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_CANCEL + &Close + + 0 + + + 0 + + 1 + m_buttonClose + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnCancelClick + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Create ERC report + + 0 + + + 0 + + 1 + m_WriteResultOpt + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + 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_staticline2 + 1 + + + protected + 1 + + Resizable + 1 + + wxLI_HORIZONTAL + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxTOP|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Markers: + + 0 + + + 0 + + 1 + m_textMarkers + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxEXPAND + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_MAKER_HTMLLISTBOX + + 0 + + + 0 + 500,350 + 1 + m_MarkersList + 1 + + + protected + 1 + + Resizable + 1 + + + ERC_HTML_LISTBOX; dialog_erc_listbox.h + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + wxSIMPLE_BORDER + + + + + + + + + + + + OnLeftDClickMarkersList + + + + + + + + + + + + + + + + + + + + + Options + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_PanelERCOptions + 1 + + + protected + 1 + + Resizable + 1 + + + 0 + + + + wxTAB_TRAVERSAL + + + + + + + + + + + + + + + + + + + + + + + + + + m_PanelMatrixSizer + wxVERTICAL + protected + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_RESET_MATRIX + Reset + + 0 + + + 0 + + 1 + m_ResetOptButton + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnResetMatrixClick + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + + m_MatrixSizer + wxVERTICAL + protected + + + + + + + + + + + diff --git a/eeschema/dialogs/dialog_erc_base.h b/eeschema/dialogs/dialog_erc_base.h index 385b89f208..432cbef725 100644 --- a/eeschema/dialogs/dialog_erc_base.h +++ b/eeschema/dialogs/dialog_erc_base.h @@ -1,17 +1,18 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 16 2008) +// C++ code generated with wxFormBuilder (version Apr 11 2012) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#ifndef __dialog_erc_base__ -#define __dialog_erc_base__ +#ifndef __DIALOG_ERC_BASE_H__ +#define __DIALOG_ERC_BASE_H__ +#include +#include #include - -class ERC_HTML_LISTBOX; - +#include "dialog_erc_listbox.h" +#include "dialog_shim.h" #include #include #include @@ -37,7 +38,7 @@ class ERC_HTML_LISTBOX; /////////////////////////////////////////////////////////////////////////////// /// Class DIALOG_ERC_BASE /////////////////////////////////////////////////////////////////////////////// -class DIALOG_ERC_BASE : public wxDialog +class DIALOG_ERC_BASE : public DIALOG_SHIM { DECLARE_EVENT_TABLE() private: @@ -56,7 +57,7 @@ class DIALOG_ERC_BASE : public wxDialog ID_ERC_CMP = 1000, ID_ERASE_DRC_MARKERS, ID_MAKER_HTMLLISTBOX, - ID_RESET_MATRIX, + ID_RESET_MATRIX }; wxNotebook* m_NoteBook; @@ -83,17 +84,18 @@ class DIALOG_ERC_BASE : public wxDialog wxBoxSizer* m_MatrixSizer; // Virtual event handlers, overide them in your derived class - virtual void OnErcCmpClick( wxCommandEvent& event ){ event.Skip(); } - virtual void OnEraseDrcMarkersClick( wxCommandEvent& event ){ event.Skip(); } - virtual void OnCancelClick( wxCommandEvent& event ){ event.Skip(); } - virtual void OnLeftDClickMarkersList( wxCommandEvent& event ){ event.Skip(); } - virtual void OnResetMatrixClick( wxCommandEvent& event ){ event.Skip(); } + virtual void OnErcCmpClick( wxCommandEvent& event ) { event.Skip(); } + virtual void OnEraseDrcMarkersClick( wxCommandEvent& event ) { event.Skip(); } + virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); } + virtual void OnLeftDClickMarkersList( wxCommandEvent& event ) { event.Skip(); } + virtual void OnResetMatrixClick( wxCommandEvent& event ) { event.Skip(); } public: - DIALOG_ERC_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("EESchema Erc"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 438,407 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + + DIALOG_ERC_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("EESchema Erc"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_ERC_BASE(); }; -#endif //__dialog_erc_base__ +#endif //__DIALOG_ERC_BASE_H__ diff --git a/eeschema/hotkeys.cpp b/eeschema/hotkeys.cpp index 5310a3a606..274d1631dd 100644 --- a/eeschema/hotkeys.cpp +++ b/eeschema/hotkeys.cpp @@ -480,15 +480,15 @@ void SCH_EDIT_FRAME::OnHotKey( wxDC* aDC, int aHotKey, const wxPoint& aPosition, case HK_EDIT: // Edit schematic item. case HK_EDIT_COMPONENT_VALUE: // Edit component value field. case HK_EDIT_COMPONENT_FOOTPRINT: // Edit component footprint field. - { - EDA_HOTKEY_CLIENT_DATA data( aPosition ); - cmd.SetInt( hotKey->m_Idcommand ); - cmd.SetClientObject( &data ); - cmd.SetId( hotKey->m_IdMenuEvent ); - GetEventHandler()->ProcessEvent( cmd ); + { + EDA_HOTKEY_CLIENT_DATA data( aPosition ); + cmd.SetInt( hotKey->m_Idcommand ); + cmd.SetClientObject( &data ); + cmd.SetId( hotKey->m_IdMenuEvent ); + GetEventHandler()->ProcessEvent( cmd ); + } break; } - } } diff --git a/eeschema/schedit.cpp b/eeschema/schedit.cpp index b6c0ce4113..6fc86aee1f 100644 --- a/eeschema/schedit.cpp +++ b/eeschema/schedit.cpp @@ -371,7 +371,7 @@ void SCH_EDIT_FRAME::Process_Special_Functions( wxCommandEvent& event ) void SCH_EDIT_FRAME::OnMoveItem( wxCommandEvent& aEvent ) { SCH_SCREEN* screen = GetScreen(); - SCH_ITEM* item = screen->GetCurItem(); + SCH_ITEM* item = screen->GetCurItem(); if( item == NULL ) { diff --git a/eeschema/template_fieldnames.cpp b/eeschema/template_fieldnames.cpp index 2f119b26e9..c3c1730659 100644 --- a/eeschema/template_fieldnames.cpp +++ b/eeschema/template_fieldnames.cpp @@ -100,7 +100,7 @@ void TEMPLATES::Parse( TEMPLATE_FIELDNAMES_LEXER* in ) throw( IO_ERROR ) { T tok; - while( (tok = in->NextTok() ) != T_RIGHT && tok != T_EOF ) + while( ( tok = in->NextTok() ) != T_RIGHT && tok != T_EOF ) { if( tok == T_LEFT ) tok = in->NextTok(); @@ -132,8 +132,6 @@ void TEMPLATES::Parse( TEMPLATE_FIELDNAMES_LEXER* in ) throw( IO_ERROR ) break; } } - - D(printf("tok:%d\n", tok);) } diff --git a/pcbnew/files.cpp b/pcbnew/files.cpp index 70b941ffb5..d992e9e20c 100644 --- a/pcbnew/files.cpp +++ b/pcbnew/files.cpp @@ -181,6 +181,7 @@ the changes?" ) ) ) // This is a subset of all PLUGINs which are trusted to be able to // load a BOARD. Order is subject to change as KICAD plugin matures. // User may occasionally use the wrong plugin to load a *.brd file, + // (since both legacy and eagle use *.brd extension), // but eventually *.kicad_pcb will be more common than legacy *.brd files. static const struct {