router: multiple changes (80adf9d8) · Commits · Elphel / kicad-source-mirror

pcbnew/dialogs/dialog_track_via_size.cpp

+12 −10

Original line number	Original line	Diff line number	Diff line
	@@ -23,22 +23,22 @@
	*/		*/

	#include "dialog_track_via_size.h"		#include "dialog_track_via_size.h"
	#include <router/pns_routing_settings.h>
	#include <base_units.h>		#include <base_units.h>
	#include <confirm.h>		#include <confirm.h>
	#include <boost/optional.hpp>		#include <boost/optional.hpp>

	DIALOG_TRACK_VIA_SIZE::DIALOG_TRACK_VIA_SIZE( wxWindow* aParent, PNS_ROUTING_SETTINGS& aSettings ) :		#include "class_board_design_settings.h"

			DIALOG_TRACK_VIA_SIZE::DIALOG_TRACK_VIA_SIZE( wxWindow* aParent, BOARD_DESIGN_SETTINGS& aSettings ) :
	DIALOG_TRACK_VIA_SIZE_BASE( aParent ),		DIALOG_TRACK_VIA_SIZE_BASE( aParent ),
	m_settings( aSettings )		m_settings( aSettings )
	{		{
	// Load router settings to dialog fields		// Load router settings to dialog fields
	m_trackWidth->SetValue( To_User_Unit( m_trackWidth->GetUnits(), m_settings.GetTrackWidth() ) );		m_trackWidth->SetValue( To_User_Unit( m_trackWidth->GetUnits(), m_settings.GetCustomTrackWidth() ) );
	m_viaDiameter->SetValue( To_User_Unit( m_viaDiameter->GetUnits(), m_settings.GetViaDiameter() ) );		m_viaDiameter->SetValue( To_User_Unit( m_viaDiameter->GetUnits(), m_settings.GetCustomViaSize() ) );
	m_viaDrill->SetValue( To_User_Unit( m_viaDrill->GetUnits(), m_settings.GetViaDrill() ) );		m_viaDrill->SetValue( To_User_Unit( m_viaDrill->GetUnits(), m_settings.GetCustomViaDrill() ) );

	m_trackWidth->SetFocus();		m_trackWidth->SetFocus();
	GetSizer()->SetSizeHints( this );

	// Pressing ENTER when any of the text input fields is active applies changes		// Pressing ENTER when any of the text input fields is active applies changes
	#if wxCHECK_VERSION( 3, 0, 0 )		#if wxCHECK_VERSION( 3, 0, 0 )
	@@ -46,6 +46,8 @@ DIALOG_TRACK_VIA_SIZE::DIALOG_TRACK_VIA_SIZE( wxWindow* aParent, PNS_ROUTING_SET
	#else		#else
	Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( DIALOG_TRACK_VIA_SIZE::onOkClick ), NULL, this );		Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( DIALOG_TRACK_VIA_SIZE::onOkClick ), NULL, this );
	#endif		#endif

			Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_TRACK_VIA_SIZE::onClose ) );
	}		}


	@@ -56,7 +58,7 @@ bool DIALOG_TRACK_VIA_SIZE::check()
	return false;		return false;

	// Via drill should be smaller than via diameter		// Via drill should be smaller than via diameter
	if( *m_viaDrill->GetValue() >= m_viaDiameter->GetValue() )		if( m_viaDrill->GetValue() >= m_viaDiameter->GetValue() )
	return false;		return false;

	return true;		return true;
	@@ -74,9 +76,9 @@ void DIALOG_TRACK_VIA_SIZE::onOkClick( wxCommandEvent& aEvent )
	if( check() )		if( check() )
	{		{
	// Store dialog values to the router settings		// Store dialog values to the router settings
	m_settings.SetTrackWidth( From_User_Unit( m_trackWidth->GetUnits(), *m_trackWidth->GetValue() ) );		m_settings.SetCustomTrackWidth( From_User_Unit( m_trackWidth->GetUnits(), *m_trackWidth->GetValue() ) );
	m_settings.SetViaDiameter( From_User_Unit( m_viaDiameter->GetUnits(), *m_viaDiameter->GetValue() ) );		m_settings.SetCustomViaSize( From_User_Unit( m_viaDiameter->GetUnits(), *m_viaDiameter->GetValue() ) );
	m_settings.SetViaDrill( From_User_Unit( m_viaDrill->GetUnits(), *m_viaDrill->GetValue() ) );		m_settings.SetCustomViaDrill( From_User_Unit( m_viaDrill->GetUnits(), *m_viaDrill->GetValue() ) );
	EndModal( 1 );		EndModal( 1 );
	}		}
	else		else

pcbnew/dialogs/dialog_track_via_size.h

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -19,7 +19,7 @@
	*/		*/

	/**		/**
	* Push and Shove router track width and via size dialog.		* Custom track width and via size dialog.
	*/		*/

	#ifndef __dialog_track_via_size__		#ifndef __dialog_track_via_size__
	@@ -27,18 +27,18 @@

	#include "dialog_track_via_size_base.h"		#include "dialog_track_via_size_base.h"

	class PNS_ROUTING_SETTINGS;		class BOARD_DESIGN_SETTINGS;

	/** Implementing DIALOG_TRACK_VIA_SIZE_BASE */		/** Implementing DIALOG_TRACK_VIA_SIZE_BASE */
	class DIALOG_TRACK_VIA_SIZE : public DIALOG_TRACK_VIA_SIZE_BASE		class DIALOG_TRACK_VIA_SIZE : public DIALOG_TRACK_VIA_SIZE_BASE
	{		{
	public:		public:
	/** Constructor */		/** Constructor */
	DIALOG_TRACK_VIA_SIZE( wxWindow* aParent, PNS_ROUTING_SETTINGS& aSettings );		DIALOG_TRACK_VIA_SIZE( wxWindow* aParent, BOARD_DESIGN_SETTINGS& aSettings );

	protected:		protected:
	// Routings settings that are modified by the dialog.		// Routings settings that are modified by the dialog.
	PNS_ROUTING_SETTINGS& m_settings;		BOARD_DESIGN_SETTINGS& m_settings;

	///> Checks if values given in the dialog are sensible.		///> Checks if values given in the dialog are sensible.
	bool check();		bool check();

pcbnew/dialogs/dialog_track_via_size_base.cpp

+17 −21

Original line number	Original line	Diff line number	Diff line
	///////////////////////////////////////////////////////////////////////////		///////////////////////////////////////////////////////////////////////////
	// C++ code generated with wxFormBuilder (version Nov 6 2013)		// C++ code generated with wxFormBuilder (version Jun 6 2014)
	// http://www.wxformbuilder.org/		// http://www.wxformbuilder.org/
	//		//
	// PLEASE DO "NOT" EDIT THIS FILE!		// PLEASE DO "NOT" EDIT THIS FILE!
	///////////////////////////////////////////////////////////////////////////		///////////////////////////////////////////////////////////////////////////

	#include "dialog_shim.h"

	#include "dialog_track_via_size_base.h"		#include "dialog_track_via_size_base.h"

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

	DIALOG_TRACK_VIA_SIZE_BASE::DIALOG_TRACK_VIA_SIZE_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )		DIALOG_TRACK_VIA_SIZE_BASE::DIALOG_TRACK_VIA_SIZE_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
	{		{
	this->SetSizeHints( wxDefaultSize, wxDefaultSize );		this->SetSizeHints( wxSize( 280,240 ), wxDefaultSize );

	wxBoxSizer* bSizes;		wxBoxSizer* bSizes;
	bSizes = new wxBoxSizer( wxVERTICAL );		bSizes = new wxBoxSizer( wxVERTICAL );

	m_trackWidth = new WX_UNIT_TEXT( this, _("Track width:") );		m_trackWidth = new WX_UNIT_TEXT( this, _("Track width:") );
	bSizes->Add( m_trackWidth, 0, wxALL, 5 );		bSizes->Add( m_trackWidth, 0, wxALL\|wxEXPAND, 5 );

	m_viaDiameter = new WX_UNIT_TEXT( this, _("Via diameter:") );		m_viaDiameter = new WX_UNIT_TEXT( this, _("Via diameter:") );
	bSizes->Add( m_viaDiameter, 0, wxALL, 5 );		bSizes->Add( m_viaDiameter, 0, wxALL\|wxEXPAND, 5 );

	m_viaDrill = new WX_UNIT_TEXT( this, _("Via drill:") );		m_viaDrill = new WX_UNIT_TEXT( this, _("Via drill:") );
	bSizes->Add( m_viaDrill, 0, wxALL, 5 );		bSizes->Add( m_viaDrill, 0, wxALL\|wxEXPAND, 5 );

	wxBoxSizer* bButtons;
	bButtons = new wxBoxSizer( wxHORIZONTAL );

	m_ok = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 );
	bButtons->Add( m_ok, 1, wxALL, 5 );

	m_cancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
	bButtons->Add( m_cancel, 1, wxALL, 5 );

			m_stdButtons = new wxStdDialogButtonSizer();
			m_stdButtonsOK = new wxButton( this, wxID_OK );
			m_stdButtons->AddButton( m_stdButtonsOK );
			m_stdButtonsCancel = new wxButton( this, wxID_CANCEL );
			m_stdButtons->AddButton( m_stdButtonsCancel );
			m_stdButtons->Realize();

	bSizes->Add( bButtons, 0, wxEXPAND, 5 );		bSizes->Add( m_stdButtons, 0, wxEXPAND\|wxALL, 5 );


	this->SetSizer( bSizes );		this->SetSizer( bSizes );
	this->Layout();		this->Layout();
			bSizes->Fit( this );

	this->Centre( wxBOTH );		this->Centre( wxBOTH );

	// Connect Events		// Connect Events
	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_TRACK_VIA_SIZE_BASE::onClose ) );		this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_TRACK_VIA_SIZE_BASE::onClose ) );
	m_ok->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_TRACK_VIA_SIZE_BASE::onOkClick ), NULL, this );		m_stdButtonsCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_TRACK_VIA_SIZE_BASE::onCancelClick ), NULL, this );
	m_cancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_TRACK_VIA_SIZE_BASE::onCancelClick ), NULL, this );		m_stdButtonsOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_TRACK_VIA_SIZE_BASE::onOkClick ), NULL, this );
	}		}

	DIALOG_TRACK_VIA_SIZE_BASE::~DIALOG_TRACK_VIA_SIZE_BASE()		DIALOG_TRACK_VIA_SIZE_BASE::~DIALOG_TRACK_VIA_SIZE_BASE()
	{		{
	// Disconnect Events		// Disconnect Events
	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_TRACK_VIA_SIZE_BASE::onClose ) );		this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_TRACK_VIA_SIZE_BASE::onClose ) );
	m_ok->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_TRACK_VIA_SIZE_BASE::onOkClick ), NULL, this );		m_stdButtonsCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_TRACK_VIA_SIZE_BASE::onCancelClick ), NULL, this );
	m_cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_TRACK_VIA_SIZE_BASE::onCancelClick ), NULL, this );		m_stdButtonsOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_TRACK_VIA_SIZE_BASE::onOkClick ), NULL, this );

	}		}

pcbnew/dialogs/dialog_track_via_size_base.fbp

+25 −186

Original line number	Original line	Diff line number	Diff line
	<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>		<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
	<wxFormBuilder_Project>		<wxFormBuilder_Project>
	<FileVersion major="1" minor="11" />		<FileVersion major="1" minor="13" />
	<object class="Project" expanded="1">		<object class="Project" expanded="1">
	<property name="class_decoration"></property>		<property name="class_decoration"></property>
	<property name="code_generation">C++</property>		<property name="code_generation">C++</property>
	@@ -41,11 +41,11 @@
	<property name="hidden">0</property>		<property name="hidden">0</property>
	<property name="id">wxID_ANY</property>		<property name="id">wxID_ANY</property>
	<property name="maximum_size"></property>		<property name="maximum_size"></property>
	<property name="minimum_size"></property>		<property name="minimum_size">280,240</property>
	<property name="name">DIALOG_TRACK_VIA_SIZE_BASE</property>		<property name="name">DIALOG_TRACK_VIA_SIZE_BASE</property>
	<property name="pos"></property>		<property name="pos"></property>
	<property name="size">388,162</property>		<property name="size">-1,-1</property>
	<property name="style">wxDEFAULT_DIALOG_STYLE\|wxRESIZE_BORDER</property>		<property name="style">wxDEFAULT_DIALOG_STYLE</property>
	<property name="subclass"></property>		<property name="subclass"></property>
	<property name="title">Track width and via size</property>		<property name="title">Track width and via size</property>
	<property name="tooltip"></property>		<property name="tooltip"></property>
	@@ -147,7 +147,7 @@
	<property name="settings"></property>		<property name="settings"></property>
	<property name="show">1</property>		<property name="show">1</property>
	<property name="size"></property>		<property name="size"></property>
	<property name="subclass">DIALOG_SHIM; dialog_shim.h</property>		<property name="subclass"></property>
	<property name="toolbar_pane">0</property>		<property name="toolbar_pane">0</property>
	<property name="tooltip"></property>		<property name="tooltip"></property>
	<property name="window_extra_style"></property>		<property name="window_extra_style"></property>
	@@ -350,189 +350,28 @@
	</object>		</object>
	<object class="sizeritem" expanded="1">		<object class="sizeritem" expanded="1">
	<property name="border">5</property>		<property name="border">5</property>
	<property name="flag">wxEXPAND</property>		<property name="flag">wxEXPAND\|wxALL</property>
	<property name="proportion">0</property>		<property name="proportion">0</property>
	<object class="wxBoxSizer" expanded="1">		<object class="wxStdDialogButtonSizer" expanded="1">
			<property name="Apply">0</property>
			<property name="Cancel">1</property>
			<property name="ContextHelp">0</property>
			<property name="Help">0</property>
			<property name="No">0</property>
			<property name="OK">1</property>
			<property name="Save">0</property>
			<property name="Yes">0</property>
	<property name="minimum_size"></property>		<property name="minimum_size"></property>
	<property name="name">bButtons</property>		<property name="name">m_stdButtons</property>
	<property name="orient">wxHORIZONTAL</property>
	<property name="permission">none</property>
	<object class="sizeritem" expanded="1">
	<property name="border">5</property>
	<property name="flag">wxALL</property>
	<property name="proportion">1</property>
	<object class="wxButton" expanded="1">
	<property name="BottomDockable">1</property>
	<property name="LeftDockable">1</property>
	<property name="RightDockable">1</property>
	<property name="TopDockable">1</property>
	<property name="aui_layer"></property>
	<property name="aui_name"></property>
	<property name="aui_position"></property>
	<property name="aui_row"></property>
	<property name="best_size"></property>
	<property name="bg"></property>
	<property name="caption"></property>
	<property name="caption_visible">1</property>
	<property name="center_pane">0</property>
	<property name="close_button">1</property>
	<property name="context_help"></property>
	<property name="context_menu">1</property>
	<property name="default">0</property>
	<property name="default_pane">0</property>
	<property name="dock">Dock</property>
	<property name="dock_fixed">0</property>
	<property name="docking">Left</property>
	<property name="enabled">1</property>
	<property name="fg"></property>
	<property name="floatable">1</property>
	<property name="font"></property>
	<property name="gripper">0</property>
	<property name="hidden">0</property>
	<property name="id">wxID_OK</property>
	<property name="label">OK</property>
	<property name="max_size"></property>
	<property name="maximize_button">0</property>
	<property name="maximum_size"></property>
	<property name="min_size"></property>
	<property name="minimize_button">0</property>
	<property name="minimum_size"></property>
	<property name="moveable">1</property>
	<property name="name">m_ok</property>
	<property name="pane_border">1</property>
	<property name="pane_position"></property>
	<property name="pane_size"></property>
	<property name="permission">protected</property>		<property name="permission">protected</property>
	<property name="pin_button">1</property>		<event name="OnApplyButtonClick"></event>
	<property name="pos"></property>		<event name="OnCancelButtonClick">onCancelClick</event>
	<property name="resize">Resizable</property>		<event name="OnContextHelpButtonClick"></event>
	<property name="show">1</property>		<event name="OnHelpButtonClick"></event>
	<property name="size"></property>		<event name="OnNoButtonClick"></event>
	<property name="style"></property>		<event name="OnOKButtonClick">onOkClick</event>
	<property name="subclass"></property>		<event name="OnSaveButtonClick"></event>
	<property name="toolbar_pane">0</property>		<event name="OnYesButtonClick"></event>
	<property name="tooltip"></property>
	<property name="validator_data_type"></property>
	<property name="validator_style">wxFILTER_NONE</property>
	<property name="validator_type">wxDefaultValidator</property>
	<property name="validator_variable"></property>
	<property name="window_extra_style"></property>
	<property name="window_name"></property>
	<property name="window_style"></property>
	<event name="OnButtonClick">onOkClick</event>
	<event name="OnChar"></event>
	<event name="OnEnterWindow"></event>
	<event name="OnEraseBackground"></event>
	<event name="OnKeyDown"></event>
	<event name="OnKeyUp"></event>
	<event name="OnKillFocus"></event>
	<event name="OnLeaveWindow"></event>
	<event name="OnLeftDClick"></event>
	<event name="OnLeftDown"></event>
	<event name="OnLeftUp"></event>
	<event name="OnMiddleDClick"></event>
	<event name="OnMiddleDown"></event>
	<event name="OnMiddleUp"></event>
	<event name="OnMotion"></event>
	<event name="OnMouseEvents"></event>
	<event name="OnMouseWheel"></event>
	<event name="OnPaint"></event>
	<event name="OnRightDClick"></event>
	<event name="OnRightDown"></event>
	<event name="OnRightUp"></event>
	<event name="OnSetFocus"></event>
	<event name="OnSize"></event>
	<event name="OnUpdateUI"></event>
	</object>
	</object>
	<object class="sizeritem" expanded="1">
	<property name="border">5</property>
	<property name="flag">wxALL</property>
	<property name="proportion">1</property>
	<object class="wxButton" expanded="1">
	<property name="BottomDockable">1</property>
	<property name="LeftDockable">1</property>
	<property name="RightDockable">1</property>
	<property name="TopDockable">1</property>
	<property name="aui_layer"></property>
	<property name="aui_name"></property>
	<property name="aui_position"></property>
	<property name="aui_row"></property>
	<property name="best_size"></property>
	<property name="bg"></property>
	<property name="caption"></property>
	<property name="caption_visible">1</property>
	<property name="center_pane">0</property>
	<property name="close_button">1</property>
	<property name="context_help"></property>
	<property name="context_menu">1</property>
	<property name="default">0</property>
	<property name="default_pane">0</property>
	<property name="dock">Dock</property>
	<property name="dock_fixed">0</property>
	<property name="docking">Left</property>
	<property name="enabled">1</property>
	<property name="fg"></property>
	<property name="floatable">1</property>
	<property name="font"></property>
	<property name="gripper">0</property>
	<property name="hidden">0</property>
	<property name="id">wxID_CANCEL</property>
	<property name="label">Cancel</property>
	<property name="max_size"></property>
	<property name="maximize_button">0</property>
	<property name="maximum_size"></property>
	<property name="min_size"></property>
	<property name="minimize_button">0</property>
	<property name="minimum_size"></property>
	<property name="moveable">1</property>
	<property name="name">m_cancel</property>
	<property name="pane_border">1</property>
	<property name="pane_position"></property>
	<property name="pane_size"></property>
	<property name="permission">protected</property>
	<property name="pin_button">1</property>
	<property name="pos"></property>
	<property name="resize">Resizable</property>
	<property name="show">1</property>
	<property name="size"></property>
	<property name="style"></property>
	<property name="subclass"></property>
	<property name="toolbar_pane">0</property>
	<property name="tooltip"></property>
	<property name="validator_data_type"></property>
	<property name="validator_style">wxFILTER_NONE</property>
	<property name="validator_type">wxDefaultValidator</property>
	<property name="validator_variable"></property>
	<property name="window_extra_style"></property>
	<property name="window_name"></property>
	<property name="window_style"></property>
	<event name="OnButtonClick">onCancelClick</event>
	<event name="OnChar"></event>
	<event name="OnEnterWindow"></event>
	<event name="OnEraseBackground"></event>
	<event name="OnKeyDown"></event>
	<event name="OnKeyUp"></event>
	<event name="OnKillFocus"></event>
	<event name="OnLeaveWindow"></event>
	<event name="OnLeftDClick"></event>
	<event name="OnLeftDown"></event>
	<event name="OnLeftUp"></event>
	<event name="OnMiddleDClick"></event>
	<event name="OnMiddleDown"></event>
	<event name="OnMiddleUp"></event>
	<event name="OnMotion"></event>
	<event name="OnMouseEvents"></event>
	<event name="OnMouseWheel"></event>
	<event name="OnPaint"></event>
	<event name="OnRightDClick"></event>
	<event name="OnRightDown"></event>
	<event name="OnRightUp"></event>
	<event name="OnSetFocus"></event>
	<event name="OnSize"></event>
	<event name="OnUpdateUI"></event>
	</object>
	</object>
	</object>		</object>
	</object>		</object>
	</object>		</object>

pcbnew/dialogs/dialog_track_via_size_base.h

+7 −8

Original line number	Original line	Diff line number	Diff line
	///////////////////////////////////////////////////////////////////////////		///////////////////////////////////////////////////////////////////////////
	// C++ code generated with wxFormBuilder (version Nov 6 2013)		// C++ code generated with wxFormBuilder (version Jun 6 2014)
	// http://www.wxformbuilder.org/		// http://www.wxformbuilder.org/
	//		//
	// PLEASE DO "NOT" EDIT THIS FILE!		// PLEASE DO "NOT" EDIT THIS FILE!
	@@ -11,16 +11,14 @@
	#include <wx/artprov.h>		#include <wx/artprov.h>
	#include <wx/xrc/xmlres.h>		#include <wx/xrc/xmlres.h>
	#include <wx/intl.h>		#include <wx/intl.h>
	class DIALOG_SHIM;

	#include <wxunittext.h>		#include <wxunittext.h>
	#include <wx/gdicmn.h>		#include <wx/gdicmn.h>
	#include <wx/font.h>		#include <wx/font.h>
	#include <wx/colour.h>		#include <wx/colour.h>
	#include <wx/settings.h>		#include <wx/settings.h>
	#include <wx/string.h>		#include <wx/string.h>
	#include <wx/button.h>
	#include <wx/sizer.h>		#include <wx/sizer.h>
			#include <wx/button.h>
	#include <wx/dialog.h>		#include <wx/dialog.h>

	///////////////////////////////////////////////////////////////////////////		///////////////////////////////////////////////////////////////////////////
	@@ -37,18 +35,19 @@ class DIALOG_TRACK_VIA_SIZE_BASE : public wxDialog
	WX_UNIT_TEXT* m_trackWidth;		WX_UNIT_TEXT* m_trackWidth;
	WX_UNIT_TEXT* m_viaDiameter;		WX_UNIT_TEXT* m_viaDiameter;
	WX_UNIT_TEXT* m_viaDrill;		WX_UNIT_TEXT* m_viaDrill;
	wxButton* m_ok;		wxStdDialogButtonSizer* m_stdButtons;
	wxButton* m_cancel;		wxButton* m_stdButtonsOK;
			wxButton* m_stdButtonsCancel;

	// Virtual event handlers, overide them in your derived class		// Virtual event handlers, overide them in your derived class
	virtual void onClose( wxCloseEvent& event ) { event.Skip(); }		virtual void onClose( wxCloseEvent& event ) { event.Skip(); }
	virtual void onOkClick( wxCommandEvent& event ) { event.Skip(); }
	virtual void onCancelClick( wxCommandEvent& event ) { event.Skip(); }		virtual void onCancelClick( wxCommandEvent& event ) { event.Skip(); }
			virtual void onOkClick( wxCommandEvent& event ) { event.Skip(); }


	public:		public:

	DIALOG_TRACK_VIA_SIZE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Track width and via size"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 388,162 ), long style = wxDEFAULT_DIALOG_STYLE\|wxRESIZE_BORDER );		DIALOG_TRACK_VIA_SIZE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Track width and via size"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE );
	~DIALOG_TRACK_VIA_SIZE_BASE();		~DIALOG_TRACK_VIA_SIZE_BASE();

	};		};

Admin message