diff --git a/eeschema/dialogs/dialog_erc_base.cpp b/eeschema/dialogs/dialog_erc_base.cpp index f5cfcbf8f9..0d39fcad14 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 Dec 30 2017) +// C++ code generated with wxFormBuilder (version Jan 17 2019) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -14,108 +14,87 @@ 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 ); - + wxBoxSizer* bSizer1; bSizer1 = new wxBoxSizer( wxVERTICAL ); - + m_NoteBook = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); m_PanelERC = new wxPanel( m_NoteBook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bercSizer; bercSizer = new wxBoxSizer( wxVERTICAL ); - + wxBoxSizer* bupperSizer; bupperSizer = new wxBoxSizer( wxHORIZONTAL ); - + wxStaticBoxSizer* sdiagSizer; sdiagSizer = new wxStaticBoxSizer( new wxStaticBox( m_PanelERC, wxID_ANY, _("ERC Report:") ), wxVERTICAL ); - + wxGridSizer* gSizeDiag; gSizeDiag = new wxGridSizer( 3, 2, 5, 5 ); - + m_ErcTotalErrorsText = new wxStaticText( sdiagSizer->GetStaticBox(), wxID_ANY, _("Total:"), wxDefaultPosition, wxDefaultSize, 0 ); m_ErcTotalErrorsText->Wrap( -1 ); gSizeDiag->Add( m_ErcTotalErrorsText, 1, wxALIGN_CENTER_VERTICAL, 5 ); - + m_TotalErrCount = new wxTextCtrl( sdiagSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY ); gSizeDiag->Add( m_TotalErrCount, 0, wxALIGN_CENTER_VERTICAL, 5 ); - + m_WarnErcErrorsText = new wxStaticText( sdiagSizer->GetStaticBox(), wxID_ANY, _("Warnings:"), wxDefaultPosition, wxDefaultSize, 0 ); m_WarnErcErrorsText->Wrap( -1 ); gSizeDiag->Add( m_WarnErcErrorsText, 1, wxALIGN_CENTER_VERTICAL, 5 ); - + m_LastWarningCount = new wxTextCtrl( sdiagSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY ); gSizeDiag->Add( m_LastWarningCount, 0, wxALIGN_CENTER_VERTICAL, 5 ); - + m_LastErrCountText = new wxStaticText( sdiagSizer->GetStaticBox(), wxID_ANY, _("Errors:"), wxDefaultPosition, wxDefaultSize, 0 ); m_LastErrCountText->Wrap( -1 ); gSizeDiag->Add( m_LastErrCountText, 1, wxALIGN_CENTER_VERTICAL, 5 ); - + m_LastErrCount = new wxTextCtrl( sdiagSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY ); gSizeDiag->Add( m_LastErrCount, 0, wxALIGN_CENTER_VERTICAL, 5 ); - - + + sdiagSizer->Add( gSizeDiag, 0, wxALL|wxEXPAND, 5 ); - + m_staticline1 = new wxStaticLine( sdiagSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); sdiagSizer->Add( m_staticline1, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 ); - + m_WriteResultOpt = new wxCheckBox( sdiagSizer->GetStaticBox(), wxID_ANY, _("Create ERC file report"), wxDefaultPosition, wxDefaultSize, 0 ); sdiagSizer->Add( m_WriteResultOpt, 0, wxALL|wxBOTTOM|wxRIGHT|wxTOP, 5 ); - - + + bupperSizer->Add( sdiagSizer, 0, wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT, 5 ); - + wxBoxSizer* bSizerMessages; bSizerMessages = new wxBoxSizer( wxVERTICAL ); - + m_titleMessages = new wxStaticText( m_PanelERC, wxID_ANY, _("Messages:"), wxDefaultPosition, wxDefaultSize, 0 ); m_titleMessages->Wrap( -1 ); m_titleMessages->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); - + bSizerMessages->Add( m_titleMessages, 0, wxRIGHT|wxLEFT, 12 ); - + m_MessagesList = new wxTextCtrl( m_PanelERC, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY ); m_MessagesList->SetMinSize( wxSize( 180,-1 ) ); - + bSizerMessages->Add( m_MessagesList, 1, wxEXPAND|wxBOTTOM|wxLEFT, 5 ); - - + + bupperSizer->Add( bSizerMessages, 1, wxBOTTOM|wxEXPAND|wxRIGHT|wxTOP, 3 ); - - + + bercSizer->Add( bupperSizer, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 8 ); - + m_textMarkers = new wxStaticText( m_PanelERC, wxID_ANY, _("Error List:"), wxDefaultPosition, wxDefaultSize, 0 ); m_textMarkers->Wrap( -1 ); m_textMarkers->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); - + bercSizer->Add( m_textMarkers, 0, wxLEFT|wxRIGHT, 20 ); - + m_MarkersList = new ERC_HTML_LISTFRAME( m_PanelERC, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO|wxBORDER_SIMPLE ); bercSizer->Add( m_MarkersList, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 8 ); - - wxBoxSizer* bbuttonsSizer; - bbuttonsSizer = new wxBoxSizer( wxHORIZONTAL ); - - m_buttondelmarkers = new wxButton( m_PanelERC, ID_ERASE_DRC_MARKERS, _("Delete Markers"), wxDefaultPosition, wxDefaultSize, 0 ); - bbuttonsSizer->Add( m_buttondelmarkers, 0, wxALL|wxEXPAND, 5 ); - - - bbuttonsSizer->Add( 0, 0, 1, wxEXPAND, 5 ); - - m_sdbSizer1 = new wxStdDialogButtonSizer(); - m_sdbSizer1OK = new wxButton( m_PanelERC, wxID_OK ); - m_sdbSizer1->AddButton( m_sdbSizer1OK ); - m_sdbSizer1Cancel = new wxButton( m_PanelERC, wxID_CANCEL ); - m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); - m_sdbSizer1->Realize(); - - bbuttonsSizer->Add( m_sdbSizer1, 0, wxALL|wxEXPAND, 5 ); - - - bercSizer->Add( bbuttonsSizer, 0, wxEXPAND|wxLEFT, 5 ); - - + + m_PanelERC->SetSizer( bercSizer ); m_PanelERC->Layout(); bercSizer->Fit( m_PanelERC ); @@ -123,55 +102,76 @@ DIALOG_ERC_BASE::DIALOG_ERC_BASE( wxWindow* parent, wxWindowID id, const wxStrin m_PanelERCOptions = new wxPanel( m_NoteBook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* m_panelMatrixSizer; m_panelMatrixSizer = new wxBoxSizer( wxVERTICAL ); - + wxStaticBoxSizer* sbSizer2; sbSizer2 = new wxStaticBoxSizer( new wxStaticBox( m_PanelERCOptions, wxID_ANY, _("Label to Label Connections") ), wxVERTICAL ); - + m_cbTestSimilarLabels = new wxCheckBox( sbSizer2->GetStaticBox(), wxID_ANY, _("Test similar labels"), wxDefaultPosition, wxDefaultSize, 0 ); m_cbTestSimilarLabels->SetToolTip( _("Similar labels are labels (inside a sheet) which differs only by upper/lower case") ); - + sbSizer2->Add( m_cbTestSimilarLabels, 0, wxALL, 5 ); - + m_cbTestUniqueGlbLabels = new wxCheckBox( sbSizer2->GetStaticBox(), wxID_ANY, _("Test single instances of global labels"), wxDefaultPosition, wxDefaultSize, 0 ); m_cbTestUniqueGlbLabels->SetToolTip( _("Global labels are used to connect signals across the full hierarchy.\nThey are expected to be at least two labels with the same name.") ); - + sbSizer2->Add( m_cbTestUniqueGlbLabels, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 ); - - + + m_panelMatrixSizer->Add( sbSizer2, 0, wxALL|wxEXPAND, 5 ); - + wxStaticBoxSizer* sbSizer3; sbSizer3 = new wxStaticBoxSizer( new wxStaticBox( m_PanelERCOptions, wxID_ANY, _("Pin to Pin Connections") ), wxVERTICAL ); - + m_matrixPanel = new wxPanel( sbSizer3->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); sbSizer3->Add( m_matrixPanel, 1, wxEXPAND | wxALL, 5 ); - + m_ResetOptButton = new wxButton( sbSizer3->GetStaticBox(), ID_RESET_MATRIX, _("Reset to Defaults"), wxDefaultPosition, wxDefaultSize, 0 ); sbSizer3->Add( m_ResetOptButton, 0, wxALL, 5 ); - - + + m_panelMatrixSizer->Add( sbSizer3, 0, wxALL|wxEXPAND, 5 ); - - + + m_PanelERCOptions->SetSizer( m_panelMatrixSizer ); m_PanelERCOptions->Layout(); m_panelMatrixSizer->Fit( m_PanelERCOptions ); m_NoteBook->AddPage( m_PanelERCOptions, _("Options"), false ); - + bSizer1->Add( m_NoteBook, 1, wxEXPAND | wxALL, 5 ); - - + + wxBoxSizer* bbuttonsSizer; + bbuttonsSizer = new wxBoxSizer( wxHORIZONTAL ); + + m_buttondelmarkers = new wxButton( this, ID_ERASE_DRC_MARKERS, _("Delete Markers"), wxDefaultPosition, wxDefaultSize, 0 ); + bbuttonsSizer->Add( m_buttondelmarkers, 0, wxALL|wxEXPAND, 5 ); + + + bbuttonsSizer->Add( 0, 0, 1, wxEXPAND, 5 ); + + m_sdbSizer1 = new wxStdDialogButtonSizer(); + m_sdbSizer1OK = new wxButton( this, wxID_OK ); + m_sdbSizer1->AddButton( m_sdbSizer1OK ); + m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); + m_sdbSizer1->Realize(); + + bbuttonsSizer->Add( m_sdbSizer1, 0, wxALL|wxEXPAND, 5 ); + + + bSizer1->Add( bbuttonsSizer, 0, wxEXPAND|wxLEFT, 5 ); + + this->SetSizer( bSizer1 ); this->Layout(); - + // Connect Events this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_ERC_BASE::OnCloseErcDialog ) ); m_MarkersList->Connect( wxEVT_COMMAND_HTML_LINK_CLICKED, wxHtmlLinkEventHandler( DIALOG_ERC_BASE::OnLeftClickMarkersList ), NULL, this ); m_MarkersList->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( DIALOG_ERC_BASE::OnLeftDblClickMarkersList ), NULL, this ); + m_ResetOptButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ERC_BASE::OnResetMatrixClick ), NULL, this ); m_buttondelmarkers->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ERC_BASE::OnEraseDrcMarkersClick ), NULL, this ); m_sdbSizer1Cancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ERC_BASE::OnButtonCloseClick ), NULL, this ); m_sdbSizer1OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ERC_BASE::OnErcCmpClick ), NULL, this ); - m_ResetOptButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ERC_BASE::OnResetMatrixClick ), NULL, this ); } DIALOG_ERC_BASE::~DIALOG_ERC_BASE() @@ -180,9 +180,9 @@ DIALOG_ERC_BASE::~DIALOG_ERC_BASE() this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_ERC_BASE::OnCloseErcDialog ) ); m_MarkersList->Disconnect( wxEVT_COMMAND_HTML_LINK_CLICKED, wxHtmlLinkEventHandler( DIALOG_ERC_BASE::OnLeftClickMarkersList ), NULL, this ); m_MarkersList->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( DIALOG_ERC_BASE::OnLeftDblClickMarkersList ), NULL, this ); + m_ResetOptButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ERC_BASE::OnResetMatrixClick ), NULL, this ); m_buttondelmarkers->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ERC_BASE::OnEraseDrcMarkersClick ), NULL, this ); m_sdbSizer1Cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ERC_BASE::OnButtonCloseClick ), NULL, this ); m_sdbSizer1OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ERC_BASE::OnErcCmpClick ), NULL, this ); - m_ResetOptButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ERC_BASE::OnResetMatrixClick ), NULL, this ); - + } diff --git a/eeschema/dialogs/dialog_erc_base.fbp b/eeschema/dialogs/dialog_erc_base.fbp index b7e325d9d3..fa6ef7b126 100644 --- a/eeschema/dialogs/dialog_erc_base.fbp +++ b/eeschema/dialogs/dialog_erc_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -14,6 +14,7 @@ dialog_erc_base 1000 none + 1 dialog_ERC_base @@ -52,42 +53,7 @@ - - - - - - - - - OnCloseErcDialog - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer1 @@ -150,31 +116,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - ERC @@ -230,29 +171,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - bercSizer @@ -279,7 +197,6 @@ wxVERTICAL 1 none - 5 wxALL|wxEXPAND @@ -325,6 +242,7 @@ 0 wxID_ANY Total: + 0 0 @@ -350,29 +268,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -437,33 +332,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -499,6 +367,7 @@ 0 wxID_ANY Warnings: + 0 0 @@ -524,29 +393,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -611,33 +457,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -673,6 +492,7 @@ 0 wxID_ANY Errors: + 0 0 @@ -698,29 +518,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -785,33 +582,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -872,29 +642,6 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -959,30 +706,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1029,6 +752,7 @@ 0 wxID_ANY Messages: + 0 0 @@ -1054,29 +778,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -1141,33 +842,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1207,6 +881,7 @@ 0 wxID_ANY Error List: + 0 0 @@ -1232,29 +907,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -1313,167 +965,8 @@ wxBORDER_SIMPLE - - - - - OnLeftClickMarkersList - - - - OnLeftDblClickMarkersList - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxLEFT - 0 - - - bbuttonsSizer - wxHORIZONTAL - none - - 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 - Delete Markers - - 0 - - - 0 - - 1 - m_buttondelmarkers - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnEraseDrcMarkersClick - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - 0 - protected - 0 - - - - 5 - wxALL|wxEXPAND - 0 - - 0 - 1 - 0 - 0 - 0 - 1 - 0 - 0 - - m_sdbSizer1 - protected - - OnButtonCloseClick - - - - OnErcCmpClick - - - - @@ -1534,29 +1027,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - m_panelMatrixSizer @@ -1574,7 +1044,6 @@ wxVERTICAL 1 none - 5 wxALL @@ -1637,30 +1106,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1725,30 +1170,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1765,7 +1186,6 @@ wxVERTICAL 1 none - 5 wxEXPAND | wxALL @@ -1821,29 +1241,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - @@ -1861,25 +1258,31 @@ + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 ID_RESET_MATRIX Reset to Defaults + + 0 0 @@ -1894,6 +1297,8 @@ protected 1 + + Resizable 1 @@ -1909,29 +1314,6 @@ OnResetMatrixClick - - - - - - - - - - - - - - - - - - - - - - - @@ -1941,6 +1323,120 @@ + + 5 + wxEXPAND|wxLEFT + 0 + + + bbuttonsSizer + wxHORIZONTAL + none + + 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 + Delete Markers + + 0 + + 0 + + + 0 + + 1 + m_buttondelmarkers + 1 + + + protected + 1 + + + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnEraseDrcMarkersClick + + + + 5 + wxEXPAND + 1 + + 0 + protected + 0 + + + + 5 + wxALL|wxEXPAND + 0 + + 0 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + + m_sdbSizer1 + protected + OnButtonCloseClick + OnErcCmpClick + + + + diff --git a/eeschema/dialogs/dialog_erc_base.h b/eeschema/dialogs/dialog_erc_base.h index 0aeae1da05..1620170e25 100644 --- a/eeschema/dialogs/dialog_erc_base.h +++ b/eeschema/dialogs/dialog_erc_base.h @@ -1,12 +1,11 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Dec 30 2017) +// C++ code generated with wxFormBuilder (version Jan 17 2019) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#ifndef __DIALOG_ERC_BASE_H__ -#define __DIALOG_ERC_BASE_H__ +#pragma once #include #include @@ -26,18 +25,18 @@ class ERC_HTML_LISTFRAME; #include #include #include -#include #include #include #include #include +#include #include #include /////////////////////////////////////////////////////////////////////////// -#define ID_ERASE_DRC_MARKERS 1000 -#define ID_RESET_MATRIX 1001 +#define ID_RESET_MATRIX 1000 +#define ID_ERASE_DRC_MARKERS 1001 /////////////////////////////////////////////////////////////////////////////// /// Class DIALOG_ERC_BASE @@ -45,7 +44,7 @@ class ERC_HTML_LISTFRAME; class DIALOG_ERC_BASE : public DIALOG_SHIM { private: - + protected: wxNotebook* m_NoteBook; wxPanel* m_PanelERC; @@ -61,31 +60,30 @@ class DIALOG_ERC_BASE : public DIALOG_SHIM wxTextCtrl* m_MessagesList; wxStaticText* m_textMarkers; ERC_HTML_LISTFRAME* m_MarkersList; - wxButton* m_buttondelmarkers; - wxStdDialogButtonSizer* m_sdbSizer1; - wxButton* m_sdbSizer1OK; - wxButton* m_sdbSizer1Cancel; wxPanel* m_PanelERCOptions; wxCheckBox* m_cbTestSimilarLabels; wxCheckBox* m_cbTestUniqueGlbLabels; wxPanel* m_matrixPanel; wxButton* m_ResetOptButton; - + wxButton* m_buttondelmarkers; + wxStdDialogButtonSizer* m_sdbSizer1; + wxButton* m_sdbSizer1OK; + wxButton* m_sdbSizer1Cancel; + // Virtual event handlers, overide them in your derived class virtual void OnCloseErcDialog( wxCloseEvent& event ) { event.Skip(); } virtual void OnLeftClickMarkersList( wxHtmlLinkEvent& event ) { event.Skip(); } virtual void OnLeftDblClickMarkersList( wxMouseEvent& event ) { event.Skip(); } + virtual void OnResetMatrixClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnEraseDrcMarkersClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnButtonCloseClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnErcCmpClick( wxCommandEvent& event ) { event.Skip(); } - virtual void OnResetMatrixClick( wxCommandEvent& event ) { event.Skip(); } - - + + public: - - DIALOG_ERC_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Electrical Rules Checker"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 483,420 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + + DIALOG_ERC_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Electrical Rules Checker"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 483,420 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_ERC_BASE(); - + }; -#endif //__DIALOG_ERC_BASE_H__