Commit 44c25d14 authored by Dick Hollenbeck's avatar Dick Hollenbeck
Browse files

eeschema erc dialog extends from DIALOG_SHIM

parent b97ece7f

eeschema/dialogs/dialog_erc_base.cpp

+14 −7
Original line number Original line Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////

///////////////////////////////////////////////////////////////////////////

// C++ code generated with wxFormBuilder (version Apr 16 2008)

// C++ code generated with wxFormBuilder (version Apr 11 2012)

// http://www.wxformbuilder.org/

// http://www.wxformbuilder.org/

//

//

// PLEASE DO "NOT" EDIT THIS FILE!

// PLEASE DO "NOT" EDIT THIS FILE!

///////////////////////////////////////////////////////////////////////////

///////////////////////////////////////////////////////////////////////////





#include "dialog_erc_listbox.h"



#include "dialog_erc_base.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_ERC_CMP, DIALOG_ERC_BASE::_wxFB_OnErcCmpClick )

	EVT_BUTTON( ID_ERASE_DRC_MARKERS, DIALOG_ERC_BASE::_wxFB_OnEraseDrcMarkersClick )

	EVT_BUTTON( ID_ERASE_DRC_MARKERS, DIALOG_ERC_BASE::_wxFB_OnEraseDrcMarkersClick )

	EVT_BUTTON( wxID_CANCEL, DIALOG_ERC_BASE::_wxFB_OnCancelClick )

	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 )

	EVT_BUTTON( ID_RESET_MATRIX, DIALOG_ERC_BASE::_wxFB_OnResetMatrixClick )

END_EVENT_TABLE()

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 );

	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
@@ -64,9 +62,11 @@ DIALOG_ERC_BASE::DIALOG_ERC_BASE( wxWindow* parent, wxWindowID id, const wxStrin 
	m_LastErrCount->Wrap( -1 );

	m_LastErrCount->Wrap( -1 );

	gSizer1->Add( m_LastErrCount, 0, wxALL, 5 );

	gSizer1->Add( m_LastErrCount, 0, wxALL, 5 );

	

	

	

	sdiagSizer->Add( gSizer1, 0, 0, 5 );

	sdiagSizer->Add( gSizer1, 0, 0, 5 );

	

	

	bupperSizer->Add( sdiagSizer, 0, 0, 5 );

	

	bupperSizer->Add( sdiagSizer, 0, wxALIGN_CENTER_VERTICAL, 5 );

	

	

	wxBoxSizer* bSizeMessages;

	wxBoxSizer* bSizeMessages;

	bSizeMessages = new wxBoxSizer( wxVERTICAL );

	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 );

	bSizeMessages->Add( m_MessagesList, 1, wxEXPAND|wxBOTTOM|wxLEFT, 5 );

	

	

	

	bupperSizer->Add( bSizeMessages, 1, wxEXPAND, 5 );

	bupperSizer->Add( bSizeMessages, 1, wxEXPAND, 5 );

	

	

	wxBoxSizer* bbuttonsSizer;

	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 );

	m_buttonClose = new wxButton( m_PanelERC, wxID_CANCEL, _("&Close"), wxDefaultPosition, wxDefaultSize, 0 );

	bbuttonsSizer->Add( m_buttonClose, 0, wxALL|wxEXPAND, 5 );

	bbuttonsSizer->Add( m_buttonClose, 0, wxALL|wxEXPAND, 5 );

	

	

	

	bupperSizer->Add( bbuttonsSizer, 0, wxALIGN_CENTER_VERTICAL, 5 );

	bupperSizer->Add( bbuttonsSizer, 0, wxALIGN_CENTER_VERTICAL, 5 );

	

	

	

	bercSizer->Add( bupperSizer, 0, wxEXPAND, 5 );

	bercSizer->Add( bupperSizer, 0, wxEXPAND, 5 );

	

	

	m_WriteResultOpt = new wxCheckBox( m_PanelERC, wxID_ANY, _("Create ERC report"), wxDefaultPosition, wxDefaultSize, 0 );

	m_WriteResultOpt = new wxCheckBox( m_PanelERC, wxID_ANY, _("Create ERC report"), wxDefaultPosition, wxDefaultSize, 0 );

	

	bercSizer->Add( m_WriteResultOpt, 0, wxALL, 5 );

	bercSizer->Add( m_WriteResultOpt, 0, wxALL, 5 );

	

	

	m_staticline2 = new wxStaticLine( m_PanelERC, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );

	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 );

	bercSizer->Add( m_MarkersList, 1, wxALL|wxEXPAND, 5 );

	

	

	

	m_PanelERC->SetSizer( bercSizer );

	m_PanelERC->SetSizer( bercSizer );

	m_PanelERC->Layout();

	m_PanelERC->Layout();

	bercSizer->Fit( m_PanelERC );

	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_MatrixSizer = new wxBoxSizer( wxVERTICAL );

	

	

	

	m_PanelMatrixSizer->Add( m_MatrixSizer, 1, wxEXPAND, 5 );

	m_PanelMatrixSizer->Add( m_MatrixSizer, 1, wxEXPAND, 5 );

	

	

	

	m_PanelERCOptions->SetSizer( m_PanelMatrixSizer );

	m_PanelERCOptions->SetSizer( m_PanelMatrixSizer );

	m_PanelERCOptions->Layout();

	m_PanelERCOptions->Layout();

	m_PanelMatrixSizer->Fit( m_PanelERCOptions );

	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 );

	bSizer1->Add( m_NoteBook, 1, wxEXPAND | wxALL, 5 );

	

	

	

	this->SetSizer( bSizer1 );

	this->SetSizer( bSizer1 );

	this->Layout();

	this->Layout();

	bSizer1->Fit( this );

}

}





DIALOG_ERC_BASE::~DIALOG_ERC_BASE()

DIALOG_ERC_BASE::~DIALOG_ERC_BASE()

eeschema/dialogs/dialog_erc_base.fbp

+1870 −1186

File changed.

Preview size limit exceeded, changes collapsed.

eeschema/dialogs/dialog_erc_base.h

+17 −15
Original line number Original line Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////

///////////////////////////////////////////////////////////////////////////

// C++ code generated with wxFormBuilder (version Apr 16 2008)

// C++ code generated with wxFormBuilder (version Apr 11 2012)

// http://www.wxformbuilder.org/

// http://www.wxformbuilder.org/

//

//

// PLEASE DO "NOT" EDIT THIS FILE!

// PLEASE DO "NOT" EDIT THIS FILE!

///////////////////////////////////////////////////////////////////////////

///////////////////////////////////////////////////////////////////////////





#ifndef __dialog_erc_base__

#ifndef __DIALOG_ERC_BASE_H__

#define __dialog_erc_base__

#define __DIALOG_ERC_BASE_H__





#include <wx/artprov.h>

#include <wx/xrc/xmlres.h>

#include <wx/intl.h>

#include <wx/intl.h>



#include "dialog_erc_listbox.h"

class ERC_HTML_LISTBOX;

#include "dialog_shim.h"



#include <wx/string.h>

#include <wx/string.h>

#include <wx/stattext.h>

#include <wx/stattext.h>

#include <wx/gdicmn.h>

#include <wx/gdicmn.h>
@@ -37,7 +38,7 @@ class ERC_HTML_LISTBOX; 
///////////////////////////////////////////////////////////////////////////////

///////////////////////////////////////////////////////////////////////////////

/// Class DIALOG_ERC_BASE

/// Class DIALOG_ERC_BASE

///////////////////////////////////////////////////////////////////////////////

///////////////////////////////////////////////////////////////////////////////

class DIALOG_ERC_BASE : public wxDialog 

class DIALOG_ERC_BASE : public DIALOG_SHIM

{

{

	DECLARE_EVENT_TABLE()

	DECLARE_EVENT_TABLE()

	private:

	private:
@@ -56,7 +57,7 @@ class DIALOG_ERC_BASE : public wxDialog 
			ID_ERC_CMP = 1000,

			ID_ERC_CMP = 1000,

			ID_ERASE_DRC_MARKERS,

			ID_ERASE_DRC_MARKERS,

			ID_MAKER_HTMLLISTBOX,

			ID_MAKER_HTMLLISTBOX,

			ID_RESET_MATRIX,

			ID_RESET_MATRIX

		};

		};

		

		

		wxNotebook* m_NoteBook;

		wxNotebook* m_NoteBook;
@@ -91,9 +92,10 @@ class DIALOG_ERC_BASE : public wxDialog 
		

		

	

	

	public:

	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();

		~DIALOG_ERC_BASE();

	

	

};

};





#endif //__dialog_erc_base__
 
#endif //__DIALOG_ERC_BASE_H__

eeschema/hotkeys.cpp

+7 −7
Original line number Original line Diff line number Diff line
@@ -486,8 +486,8 @@ void SCH_EDIT_FRAME::OnHotKey( wxDC* aDC, int aHotKey, const wxPoint& aPosition, 
            cmd.SetClientObject( &data );

            cmd.SetClientObject( &data );

            cmd.SetId( hotKey->m_IdMenuEvent );

            cmd.SetId( hotKey->m_IdMenuEvent );

            GetEventHandler()->ProcessEvent( cmd );

            GetEventHandler()->ProcessEvent( cmd );

        break;

        }

        }

        break;

    }

    }

}

}

eeschema/template_fieldnames.cpp

+1 −3
Original line number Original line Diff line number Diff line
@@ -132,8 +132,6 @@ void TEMPLATES::Parse( TEMPLATE_FIELDNAMES_LEXER* in ) throw( IO_ERROR ) 
            break;

            break;

        }

        }

    }

    }



    D(printf("tok:%d\n", tok);)

}

}