More dialogs derived from DIALO_SHIM (7c0af1bf) · Commits · Elphel / kicad-source-mirror

common/class_page_info.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -139,7 +139,7 @@ void PAGE_INFO::setMargins()
	m_left_margin =		m_left_margin =
	m_right_margin =		m_right_margin =
	m_top_margin =		m_top_margin =
	m_bottom_margin = 400;		m_bottom_margin = 400; // Units = mils
	}		}
	}		}

common/dialogs/dialog_page_settings.cpp

+1 −34

Original line number	Original line	Diff line number	Diff line
	@@ -45,10 +45,6 @@

	#include <dialog_page_settings.h>		#include <dialog_page_settings.h>

	// dialog should remember its previous screen position and size
	wxPoint DIALOG_PAGES_SETTINGS::s_LastPos( -1, -1 );
	wxSize DIALOG_PAGES_SETTINGS::s_LastSize;

	// List of page formats.		// List of page formats.
	// should be statically initialized, because we need both		// should be statically initialized, because we need both
	// the translated and the not translated version.		// the translated and the not translated version.
	@@ -130,7 +126,7 @@ void DIALOG_PAGES_SETTINGS::initDialog()


	#ifdef EESCHEMA		#ifdef EESCHEMA
	// Init display value for sheet User size		// Init display value for schematic sub-sheet number
	wxString format = m_TextSheetCount->GetLabel();		wxString format = m_TextSheetCount->GetLabel();
	msg.Printf( format, m_Screen->m_NumberOfScreens );		msg.Printf( format, m_Screen->m_NumberOfScreens );
	m_TextSheetCount->SetLabel( msg );		m_TextSheetCount->SetLabel( msg );
	@@ -214,35 +210,6 @@ void DIALOG_PAGES_SETTINGS::initDialog()
	}		}


	bool DIALOG_PAGES_SETTINGS::Show( bool show )
	{
	bool ret;

	if( show )
	{
	ret = DIALOG_PAGES_SETTINGS_BASE::Show( show );

	if( s_LastPos.x != -1 )
	{
	SetSize( s_LastPos.x, s_LastPos.y, s_LastSize.x, s_LastSize.y, 0 );
	}
	else
	{
	// Do nothing: last position not yet saved.
	}
	}
	else
	{
	// Save the dialog's position before hiding
	s_LastPos = GetPosition();
	s_LastSize = GetSize();
	ret = DIALOG_PAGES_SETTINGS_BASE::Show( show );
	}

	return ret;
	}


	void DIALOG_PAGES_SETTINGS::OnCloseWindow( wxCloseEvent& event )		void DIALOG_PAGES_SETTINGS::OnCloseWindow( wxCloseEvent& event )
	{		{
	EndModal( m_modified );		EndModal( m_modified );

common/dialogs/dialog_page_settings.h

+0 −11

Original line number	Original line	Diff line number	Diff line
	@@ -47,21 +47,10 @@ private:
	PAGE_INFO m_pageInfo; /// Temporary page info.		PAGE_INFO m_pageInfo; /// Temporary page info.
	TITLE_BLOCK m_tb; /// Temporary title block (basic inscriptions).		TITLE_BLOCK m_tb; /// Temporary title block (basic inscriptions).

	static wxSize s_LastSize; /// Last position and size.
	static wxPoint s_LastPos;

	public:		public:
	DIALOG_PAGES_SETTINGS( EDA_DRAW_FRAME* parent );		DIALOG_PAGES_SETTINGS( EDA_DRAW_FRAME* parent );
	~DIALOG_PAGES_SETTINGS();		~DIALOG_PAGES_SETTINGS();

	/**
	* Function Show
	* overloads the wxDialog::Show() function so it can position the
	* dialog at its remembered size and position.
	*/
	bool Show( bool show );


	private:		private:
	/// Initialises member variables		/// Initialises member variables
	void initDialog();		void initDialog();

common/dialogs/dialog_page_settings_base.cpp

+2 −2

Original line number	Original line	Diff line number	Diff line
	///////////////////////////////////////////////////////////////////////////		///////////////////////////////////////////////////////////////////////////
	// C++ code generated with wxFormBuilder (version Mar 17 2012)		// C++ code generated with wxFormBuilder (version Apr 10 2012)
	// 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_PAGES_SETTINGS_BASE::DIALOG_PAGES_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_PAGES_SETTINGS_BASE::DIALOG_PAGES_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 );

common/dialogs/dialog_page_settings_base.fbp

+2 −56

Original line number	Original line	Diff line number	Diff line
	@@ -25,62 +25,28 @@
	<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">
	<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_managed">0</property>		<property name="aui_managed">0</property>
	<property name="aui_name"></property>		<property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
	<property name="aui_position"></property>
	<property name="aui_row"></property>
	<property name="best_size"></property>
	<property name="bg"></property>		<property name="bg"></property>
	<property name="caption"></property>
	<property name="caption_visible">1</property>
	<property name="center"></property>		<property name="center"></property>
	<property name="center_pane">0</property>
	<property name="close_button">1</property>
	<property name="context_help"></property>		<property name="context_help"></property>
	<property name="context_menu">1</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="enabled">1</property>
	<property name="event_handler">impl_virtual</property>		<property name="event_handler">impl_virtual</property>
	<property name="extra_style"></property>		<property name="extra_style"></property>
	<property name="fg"></property>		<property name="fg"></property>
	<property name="floatable">1</property>
	<property name="font"></property>		<property name="font"></property>
	<property name="gripper">0</property>
	<property name="hidden">0</property>		<property name="hidden">0</property>
	<property name="id">wxID_ANY</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="maximum_size"></property>
	<property name="min_size"></property>
	<property name="minimize_button">0</property>
	<property name="minimum_size"></property>		<property name="minimum_size"></property>
	<property name="moveable">1</property>
	<property name="name">DIALOG_PAGES_SETTINGS_BASE</property>		<property name="name">DIALOG_PAGES_SETTINGS_BASE</property>
	<property name="pane_border">1</property>
	<property name="pane_position"></property>
	<property name="pane_size"></property>
	<property name="pin_button">1</property>
	<property name="pos"></property>		<property name="pos"></property>
	<property name="resize">Resizable</property>
	<property name="show">1</property>
	<property name="size">748,495</property>		<property name="size">748,495</property>
	<property name="style">wxDEFAULT_DIALOG_STYLE\|wxRESIZE_BORDER</property>		<property name="style">wxDEFAULT_DIALOG_STYLE\|wxRESIZE_BORDER</property>
	<property name="subclass"></property>		<property name="subclass">DIALOG_SHIM; dialog_shim.h</property>
	<property name="title">Page Settings</property>		<property name="title">Page Settings</property>
	<property name="toolbar_pane">0</property>
	<property name="tooltip"></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_extra_style"></property>
	<property name="window_name"></property>		<property name="window_name"></property>
	<property name="window_style"></property>		<property name="window_style"></property>
	@@ -216,10 +182,6 @@
	<property name="subclass"></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="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_extra_style"></property>
	<property name="window_name"></property>		<property name="window_name"></property>
	<property name="window_style"></property>		<property name="window_style"></property>
	@@ -391,10 +353,6 @@
	<property name="subclass"></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="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_extra_style"></property>
	<property name="window_name"></property>		<property name="window_name"></property>
	<property name="window_style"></property>		<property name="window_style"></property>
	@@ -843,10 +801,6 @@
	<property name="subclass"></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="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_extra_style"></property>
	<property name="window_name"></property>		<property name="window_name"></property>
	<property name="window_style">wxFULL_REPAINT_ON_RESIZE\|wxSIMPLE_BORDER</property>		<property name="window_style">wxFULL_REPAINT_ON_RESIZE\|wxSIMPLE_BORDER</property>
	@@ -980,10 +934,6 @@
	<property name="subclass"></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="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_extra_style"></property>
	<property name="window_name"></property>		<property name="window_name"></property>
	<property name="window_style"></property>		<property name="window_style"></property>
	@@ -1077,10 +1027,6 @@
	<property name="subclass"></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="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_extra_style"></property>
	<property name="window_name"></property>		<property name="window_name"></property>
	<property name="window_style"></property>		<property name="window_style"></property>

Admin message