eeschema erc dialog extends from DIALOG_SHIM

eeschema/dialogs/dialog_erc_base.cpp

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

eeschema/dialogs/dialog_erc_base.h

 ///////////////////////////////////////////////////////////////////////////
-// 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 <wx/artprov.h>
+#include <wx/xrc/xmlres.h>
 #include <wx/intl.h>
-
-class ERC_HTML_LISTBOX;
-
+#include "dialog_erc_listbox.h"
+#include "dialog_shim.h"
 #include <wx/string.h>
 #include <wx/stattext.h>
 #include <wx/gdicmn.h>
@@ -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__

eeschema/hotkeys.cpp

@@ -486,8 +486,8 @@ void SCH_EDIT_FRAME::OnHotKey( wxDC* aDC, int aHotKey, const wxPoint& aPosition,
             cmd.SetClientObject( &data );
             cmd.SetId( hotKey->m_IdMenuEvent );
             GetEventHandler()->ProcessEvent( cmd );
-        break;
         }
+        break;
     }
 }
 

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

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
     {