Fix compil issue with KICAD_SCRIPTING_WXPYTHON option ON. (4cd4990b) · Commits · Elphel / kicad-source-mirror

common/draw_frame.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -119,7 +119,7 @@ EDA_DRAW_FRAME::EDA_DRAW_FRAME( KIWAY* aKiway, wxWindow* aParent,
	m_GridColor = DARKGRAY; // Grid color		m_GridColor = DARKGRAY; // Grid color
	m_showPageLimits = false;		m_showPageLimits = false;
	m_drawBgColor = BLACK; // the background color of the draw canvas:		m_drawBgColor = BLACK; // the background color of the draw canvas:
	// BLACK for Pcbnew, BLACK or WHITeEfor eeschema		// BLACK for Pcbnew, BLACK or WHITE for eeschema
	m_snapToGrid = true;		m_snapToGrid = true;
	m_MsgFrameHeight = EDA_MSG_PANEL::GetRequiredHeight();		m_MsgFrameHeight = EDA_MSG_PANEL::GetRequiredHeight();
	m_movingCursorWithKeyboard = false;		m_movingCursorWithKeyboard = false;

common/draw_panel.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -114,7 +114,7 @@ EDA_DRAW_PANEL::EDA_DRAW_PANEL( EDA_DRAW_FRAME* parent, int id,
	m_ClipBox.SetY( 0 );		m_ClipBox.SetY( 0 );
	m_canStartBlock = -1; // Command block can start if >= 0		m_canStartBlock = -1; // Command block can start if >= 0
	m_abortRequest = false;		m_abortRequest = false;
	m_enableMiddleButtonPan = false;		m_enableMiddleButtonPan = true;
	m_enableZoomNoCenter = false;		m_enableZoomNoCenter = false;
	m_panScrollbarLimits = false;		m_panScrollbarLimits = false;
	m_enableAutoPan = true;		m_enableAutoPan = true;

pcbnew/dialogs/dialog_pns_settings_base.cpp

+16 −13

Original line number	Original line	Diff line number	Diff line
	///////////////////////////////////////////////////////////////////////////		///////////////////////////////////////////////////////////////////////////
	// C++ code generated with wxFormBuilder (version Apr 30 2013)		// C++ code generated with wxFormBuilder (version Nov 6 2013)
	// http://www.wxformbuilder.org/		// http://www.wxformbuilder.org/
	//		//
	// PLEASE DO "NOT" EDIT THIS FILE!		// PLEASE DO "NOT" EDIT THIS FILE!
	@@ -9,7 +9,7 @@

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

	DIALOG_PNS_SETTINGS_BASE::DIALOG_PNS_SETTINGS_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )		DIALOG_PNS_SETTINGS_BASE::DIALOG_PNS_SETTINGS_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 );

	@@ -19,29 +19,29 @@ DIALOG_PNS_SETTINGS_BASE::DIALOG_PNS_SETTINGS_BASE( wxWindow* parent, wxWindowID
	wxString m_modeChoices[] = { _("Highlight collisions"), _("Shove"), _("Walk around"), _("Figure out what's best") };		wxString m_modeChoices[] = { _("Highlight collisions"), _("Shove"), _("Walk around"), _("Figure out what's best") };
	int m_modeNChoices = sizeof( m_modeChoices ) / sizeof( wxString );		int m_modeNChoices = sizeof( m_modeChoices ) / sizeof( wxString );
	m_mode = new wxRadioBox( this, wxID_ANY, _("Mode"), wxDefaultPosition, wxDefaultSize, m_modeNChoices, m_modeChoices, 1, wxRA_SPECIFY_COLS );		m_mode = new wxRadioBox( this, wxID_ANY, _("Mode"), wxDefaultPosition, wxDefaultSize, m_modeNChoices, m_modeChoices, 1, wxRA_SPECIFY_COLS );
	m_mode->SetSelection( 1 );		m_mode->SetSelection( 0 );
	bMainSizer->Add( m_mode, 0, wxALL, 5 );		bMainSizer->Add( m_mode, 0, wxALL\|wxEXPAND, 5 );

	wxStaticBoxSizer* bOptions;		wxStaticBoxSizer* bOptions;
	bOptions = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Options") ), wxVERTICAL );		bOptions = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Options") ), wxVERTICAL );

	m_shoveVias = new wxCheckBox( this, wxID_ANY, _("Shove vias"), wxDefaultPosition, wxDefaultSize, 0 );		m_shoveVias = new wxCheckBox( this, wxID_ANY, _("Shove vias"), wxDefaultPosition, wxDefaultSize, 0 );
	bOptions->Add( m_shoveVias, 0, wxALL, 5 );		bOptions->Add( m_shoveVias, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );

	m_backPressure = new wxCheckBox( this, wxID_ANY, _("Jump over obstacles"), wxDefaultPosition, wxDefaultSize, 0 );		m_backPressure = new wxCheckBox( this, wxID_ANY, _("Jump over obstacles"), wxDefaultPosition, wxDefaultSize, 0 );
	bOptions->Add( m_backPressure, 0, wxALL, 5 );		bOptions->Add( m_backPressure, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );

	m_removeLoops = new wxCheckBox( this, wxID_ANY, _("Remove redundant tracks"), wxDefaultPosition, wxDefaultSize, 0 );		m_removeLoops = new wxCheckBox( this, wxID_ANY, _("Remove redundant tracks"), wxDefaultPosition, wxDefaultSize, 0 );
	bOptions->Add( m_removeLoops, 0, wxALL, 5 );		bOptions->Add( m_removeLoops, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );

	m_autoNeckdown = new wxCheckBox( this, wxID_ANY, _("Automatic neckdown"), wxDefaultPosition, wxDefaultSize, 0 );		m_autoNeckdown = new wxCheckBox( this, wxID_ANY, _("Automatic neckdown"), wxDefaultPosition, wxDefaultSize, 0 );
	bOptions->Add( m_autoNeckdown, 0, wxALL, 5 );		bOptions->Add( m_autoNeckdown, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );

	m_smoothDragged = new wxCheckBox( this, wxID_ANY, _("Smooth dragged segments"), wxDefaultPosition, wxDefaultSize, 0 );		m_smoothDragged = new wxCheckBox( this, wxID_ANY, _("Smooth dragged segments"), wxDefaultPosition, wxDefaultSize, 0 );
	bOptions->Add( m_smoothDragged, 0, wxALL, 5 );		bOptions->Add( m_smoothDragged, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );

	m_violateDrc = new wxCheckBox( this, wxID_ANY, _("Allow DRC violations"), wxDefaultPosition, wxDefaultSize, 0 );		m_violateDrc = new wxCheckBox( this, wxID_ANY, _("Allow DRC violations"), wxDefaultPosition, wxDefaultSize, 0 );
	bOptions->Add( m_violateDrc, 0, wxALL, 5 );		bOptions->Add( m_violateDrc, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );

	m_suggestEnding = new wxCheckBox( this, wxID_ANY, _("Suggest track finish"), wxDefaultPosition, wxDefaultSize, 0 );		m_suggestEnding = new wxCheckBox( this, wxID_ANY, _("Suggest track finish"), wxDefaultPosition, wxDefaultSize, 0 );
	m_suggestEnding->Enable( false );		m_suggestEnding->Enable( false );
	@@ -89,7 +89,10 @@ DIALOG_PNS_SETTINGS_BASE::DIALOG_PNS_SETTINGS_BASE( wxWindow* parent, wxWindowID
	bEffort->Add( bSlider, 1, wxEXPAND, 5 );		bEffort->Add( bSlider, 1, wxEXPAND, 5 );


	bOptions->Add( bEffort, 1, wxEXPAND, 5 );		bOptions->Add( bEffort, 0, wxEXPAND, 5 );

			m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
			bOptions->Add( m_staticline1, 0, wxEXPAND \| wxALL, 5 );

	m_stdButtons = new wxStdDialogButtonSizer();		m_stdButtons = new wxStdDialogButtonSizer();
	m_stdButtonsOK = new wxButton( this, wxID_OK );		m_stdButtonsOK = new wxButton( this, wxID_OK );
	@@ -98,10 +101,10 @@ DIALOG_PNS_SETTINGS_BASE::DIALOG_PNS_SETTINGS_BASE( wxWindow* parent, wxWindowID
	m_stdButtons->AddButton( m_stdButtonsCancel );		m_stdButtons->AddButton( m_stdButtonsCancel );
	m_stdButtons->Realize();		m_stdButtons->Realize();

	bOptions->Add( m_stdButtons, 1, wxEXPAND, 5 );		bOptions->Add( m_stdButtons, 0, wxEXPAND, 5 );


	bMainSizer->Add( bOptions, 1, wxEXPAND, 5 );		bMainSizer->Add( bOptions, 1, wxEXPAND\|wxALL, 5 );


	this->SetSizer( bMainSizer );		this->SetSizer( bMainSizer );

pcbnew/dialogs/dialog_pns_settings_base.fbp

+96 −13

Original line number	Original line	Diff line number	Diff line
	@@ -20,8 +20,10 @@
	<property name="path">.</property>		<property name="path">.</property>
	<property name="precompiled_header"></property>		<property name="precompiled_header"></property>
	<property name="relative_path">1</property>		<property name="relative_path">1</property>
			<property name="skip_lua_events">1</property>
	<property name="skip_php_events">1</property>		<property name="skip_php_events">1</property>
	<property name="skip_python_events">1</property>		<property name="skip_python_events">1</property>
			<property name="ui_table">UI</property>
	<property name="use_enum">0</property>		<property name="use_enum">0</property>
	<property name="use_microsoft_bom">0</property>		<property name="use_microsoft_bom">0</property>
	<object class="Dialog" expanded="1">		<object class="Dialog" expanded="1">
	@@ -42,9 +44,9 @@
	<property name="minimum_size"></property>		<property name="minimum_size"></property>
	<property name="name">DIALOG_PNS_SETTINGS_BASE</property>		<property name="name">DIALOG_PNS_SETTINGS_BASE</property>
	<property name="pos"></property>		<property name="pos"></property>
	<property name="size">313,528</property>		<property name="size">277,404</property>
	<property name="style">wxDEFAULT_DIALOG_STYLE</property>		<property name="style">wxDEFAULT_DIALOG_STYLE</property>
	<property name="subclass"></property>		<property name="subclass">DIALOG_SHIM; dialog_shim.h</property>
	<property name="title">Interactive Router settings</property>		<property name="title">Interactive Router settings</property>
	<property name="tooltip"></property>		<property name="tooltip"></property>
	<property name="window_extra_style"></property>		<property name="window_extra_style"></property>
	@@ -93,7 +95,7 @@
	<property name="permission">none</property>		<property name="permission">none</property>
	<object class="sizeritem" expanded="1">		<object class="sizeritem" expanded="1">
	<property name="border">5</property>		<property name="border">5</property>
	<property name="flag">wxALL</property>		<property name="flag">wxALL\|wxEXPAND</property>
	<property name="proportion">0</property>		<property name="proportion">0</property>
	<object class="wxRadioBox" expanded="1">		<object class="wxRadioBox" expanded="1">
	<property name="BottomDockable">1</property>		<property name="BottomDockable">1</property>
	@@ -141,7 +143,7 @@
	<property name="pin_button">1</property>		<property name="pin_button">1</property>
	<property name="pos"></property>		<property name="pos"></property>
	<property name="resize">Resizable</property>		<property name="resize">Resizable</property>
	<property name="selection">1</property>		<property name="selection">0</property>
	<property name="show">1</property>		<property name="show">1</property>
	<property name="size"></property>		<property name="size"></property>
	<property name="style">wxRA_SPECIFY_COLS</property>		<property name="style">wxRA_SPECIFY_COLS</property>
	@@ -183,7 +185,7 @@
	</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">1</property>		<property name="proportion">1</property>
	<object class="wxStaticBoxSizer" expanded="1">		<object class="wxStaticBoxSizer" expanded="1">
	<property name="id">wxID_ANY</property>		<property name="id">wxID_ANY</property>
	@@ -195,7 +197,7 @@
	<event name="OnUpdateUI"></event>		<event name="OnUpdateUI"></event>
	<object class="sizeritem" expanded="0">		<object class="sizeritem" expanded="0">
	<property name="border">5</property>		<property name="border">5</property>
	<property name="flag">wxALL</property>		<property name="flag">wxTOP\|wxRIGHT\|wxLEFT</property>
	<property name="proportion">0</property>		<property name="proportion">0</property>
	<object class="wxCheckBox" expanded="0">		<object class="wxCheckBox" expanded="0">
	<property name="BottomDockable">1</property>		<property name="BottomDockable">1</property>
	@@ -283,7 +285,7 @@
	</object>		</object>
	<object class="sizeritem" expanded="0">		<object class="sizeritem" expanded="0">
	<property name="border">5</property>		<property name="border">5</property>
	<property name="flag">wxALL</property>		<property name="flag">wxTOP\|wxRIGHT\|wxLEFT</property>
	<property name="proportion">0</property>		<property name="proportion">0</property>
	<object class="wxCheckBox" expanded="0">		<object class="wxCheckBox" expanded="0">
	<property name="BottomDockable">1</property>		<property name="BottomDockable">1</property>
	@@ -371,7 +373,7 @@
	</object>		</object>
	<object class="sizeritem" expanded="0">		<object class="sizeritem" expanded="0">
	<property name="border">5</property>		<property name="border">5</property>
	<property name="flag">wxALL</property>		<property name="flag">wxTOP\|wxRIGHT\|wxLEFT</property>
	<property name="proportion">0</property>		<property name="proportion">0</property>
	<object class="wxCheckBox" expanded="0">		<object class="wxCheckBox" expanded="0">
	<property name="BottomDockable">1</property>		<property name="BottomDockable">1</property>
	@@ -459,7 +461,7 @@
	</object>		</object>
	<object class="sizeritem" expanded="0">		<object class="sizeritem" expanded="0">
	<property name="border">5</property>		<property name="border">5</property>
	<property name="flag">wxALL</property>		<property name="flag">wxTOP\|wxRIGHT\|wxLEFT</property>
	<property name="proportion">0</property>		<property name="proportion">0</property>
	<object class="wxCheckBox" expanded="0">		<object class="wxCheckBox" expanded="0">
	<property name="BottomDockable">1</property>		<property name="BottomDockable">1</property>
	@@ -547,7 +549,7 @@
	</object>		</object>
	<object class="sizeritem" expanded="0">		<object class="sizeritem" expanded="0">
	<property name="border">5</property>		<property name="border">5</property>
	<property name="flag">wxALL</property>		<property name="flag">wxTOP\|wxRIGHT\|wxLEFT</property>
	<property name="proportion">0</property>		<property name="proportion">0</property>
	<object class="wxCheckBox" expanded="0">		<object class="wxCheckBox" expanded="0">
	<property name="BottomDockable">1</property>		<property name="BottomDockable">1</property>
	@@ -635,7 +637,7 @@
	</object>		</object>
	<object class="sizeritem" expanded="0">		<object class="sizeritem" expanded="0">
	<property name="border">5</property>		<property name="border">5</property>
	<property name="flag">wxALL</property>		<property name="flag">wxTOP\|wxRIGHT\|wxLEFT</property>
	<property name="proportion">0</property>		<property name="proportion">0</property>
	<object class="wxCheckBox" expanded="0">		<object class="wxCheckBox" expanded="0">
	<property name="BottomDockable">1</property>		<property name="BottomDockable">1</property>
	@@ -812,7 +814,7 @@
	<object class="sizeritem" expanded="0">		<object class="sizeritem" expanded="0">
	<property name="border">5</property>		<property name="border">5</property>
	<property name="flag">wxEXPAND</property>		<property name="flag">wxEXPAND</property>
	<property name="proportion">1</property>		<property name="proportion">0</property>
	<object class="wxBoxSizer" expanded="0">		<object class="wxBoxSizer" expanded="0">
	<property name="minimum_size"></property>		<property name="minimum_size"></property>
	<property name="name">bEffort</property>		<property name="name">bEffort</property>
	@@ -1219,10 +1221,91 @@
	</object>		</object>
	</object>		</object>
	</object>		</object>
			<object class="sizeritem" expanded="1">
			<property name="border">5</property>
			<property name="flag">wxEXPAND \| wxALL</property>
			<property name="proportion">0</property>
			<object class="wxStaticLine" 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_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_ANY</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_staticline1</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">wxLI_HORIZONTAL</property>
			<property name="subclass"></property>
			<property name="toolbar_pane">0</property>
			<property name="tooltip"></property>
			<property name="window_extra_style"></property>
			<property name="window_name"></property>
			<property name="window_style"></property>
			<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">		<object class="sizeritem" expanded="1">
	<property name="border">5</property>		<property name="border">5</property>
	<property name="flag">wxEXPAND</property>		<property name="flag">wxEXPAND</property>
	<property name="proportion">1</property>		<property name="proportion">0</property>
	<object class="wxStdDialogButtonSizer" expanded="1">		<object class="wxStdDialogButtonSizer" expanded="1">
	<property name="Apply">0</property>		<property name="Apply">0</property>
	<property name="Cancel">1</property>		<property name="Cancel">1</property>

pcbnew/dialogs/dialog_pns_settings_base.h

+8 −3

Original line number	Original line	Diff line number	Diff line
	///////////////////////////////////////////////////////////////////////////		///////////////////////////////////////////////////////////////////////////
	// C++ code generated with wxFormBuilder (version Apr 30 2013)		// C++ code generated with wxFormBuilder (version Nov 6 2013)
	// http://www.wxformbuilder.org/		// http://www.wxformbuilder.org/
	//		//
	// PLEASE DO "NOT" EDIT THIS FILE!		// PLEASE DO "NOT" EDIT THIS FILE!
	@@ -11,6 +11,9 @@
	#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 "dialog_shim.h"
	#include <wx/string.h>		#include <wx/string.h>
	#include <wx/radiobox.h>		#include <wx/radiobox.h>
	#include <wx/gdicmn.h>		#include <wx/gdicmn.h>
	@@ -21,6 +24,7 @@
	#include <wx/stattext.h>		#include <wx/stattext.h>
	#include <wx/slider.h>		#include <wx/slider.h>
	#include <wx/sizer.h>		#include <wx/sizer.h>
			#include <wx/statline.h>
	#include <wx/button.h>		#include <wx/button.h>
	#include <wx/statbox.h>		#include <wx/statbox.h>
	#include <wx/dialog.h>		#include <wx/dialog.h>
	@@ -31,7 +35,7 @@
	///////////////////////////////////////////////////////////////////////////////		///////////////////////////////////////////////////////////////////////////////
	/// Class DIALOG_PNS_SETTINGS_BASE		/// Class DIALOG_PNS_SETTINGS_BASE
	///////////////////////////////////////////////////////////////////////////////		///////////////////////////////////////////////////////////////////////////////
	class DIALOG_PNS_SETTINGS_BASE : public wxDialog		class DIALOG_PNS_SETTINGS_BASE : public DIALOG_SHIM
	{		{
	private:		private:

	@@ -48,6 +52,7 @@ class DIALOG_PNS_SETTINGS_BASE : public wxDialog
	wxSlider* m_effort;		wxSlider* m_effort;
	wxStaticText* m_lowLabel;		wxStaticText* m_lowLabel;
	wxStaticText* m_highLabel;		wxStaticText* m_highLabel;
			wxStaticLine* m_staticline1;
	wxStdDialogButtonSizer* m_stdButtons;		wxStdDialogButtonSizer* m_stdButtons;
	wxButton* m_stdButtonsOK;		wxButton* m_stdButtonsOK;
	wxButton* m_stdButtonsCancel;		wxButton* m_stdButtonsCancel;
	@@ -60,7 +65,7 @@ class DIALOG_PNS_SETTINGS_BASE : public wxDialog

	public:		public:

	DIALOG_PNS_SETTINGS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Interactive Router settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 313,528 ), long style = wxDEFAULT_DIALOG_STYLE );		DIALOG_PNS_SETTINGS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Interactive Router settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 277,404 ), long style = wxDEFAULT_DIALOG_STYLE );
	~DIALOG_PNS_SETTINGS_BASE();		~DIALOG_PNS_SETTINGS_BASE();

	};		};