apply DIALOG_SHIM to dialog_lib_edit_text_base and make... (5aec4604) · Commits · Elphel / kicad-source-mirror

eeschema/dialogs/dialog_edit_one_field.cpp

+14 −15

Original line number	Diff line number	Diff line
		@@ -75,7 +75,6 @@ void DIALOG_EDIT_ONE_FIELD::initDlg_base( )
		case GR_TEXT_HJUSTIFY_RIGHT:
		m_TextHJustificationOpt->SetSelection( 2 );
		break;

		}

		switch ( m_textVjustify )

eeschema/dialogs/dialog_edit_one_field.h

+8 −6

Original line number	Diff line number	Diff line

		#ifndef _DIALOG_EDIT_ONE_FIELD_H_
		#define _DIALOG_EDIT_ONE_FIELD_H_
		#ifndef DIALOG_EDIT_ONE_FIELD_H_
		#define DIALOG_EDIT_ONE_FIELD_H_

		/*
		* This program source code file is part of KiCad, a free EDA CAD application.
		@@ -53,7 +53,8 @@ public:
		SetTitle( aTitle );
		}

		~DIALOG_EDIT_ONE_FIELD() {};
		// ~DIALOG_EDIT_ONE_FIELD() {};

		virtual void TransfertDataToField();

		void SetTextField( const wxString& aText )
		@@ -101,6 +102,7 @@ private:
		void initDlg( );
		};


		// Class to edit a schematic component field
		class DIALOG_SCH_EDIT_ONE_FIELD : public DIALOG_EDIT_ONE_FIELD
		{
		@@ -117,7 +119,8 @@ public:
		GetSizer()->SetSizeHints(this);
		Centre();
		}
		~DIALOG_SCH_EDIT_ONE_FIELD() {};

		// ~DIALOG_SCH_EDIT_ONE_FIELD() {};

		void TransfertDataToField();
		wxString GetTextField();
		@@ -126,5 +129,4 @@ private:
		void initDlg( );
		};


		#endif // _DIALOG_EDIT_ONE_FIELD_H_
		#endif // DIALOG_EDIT_ONE_FIELD_H_

eeschema/dialogs/dialog_lib_edit_pin_base.cpp

+216 −216

Original line number	Diff line number	Diff line
		///////////////////////////////////////////////////////////////////////////
		// C++ code generated with wxFormBuilder (version Mar 17 2012)
		// C++ code generated with wxFormBuilder (version Apr 11 2012)
		// http://www.wxformbuilder.org/
		//
		// PLEASE DO "NOT" EDIT THIS FILE!
		@@ -99,7 +99,7 @@ DIALOG_LIB_EDIT_PIN_BASE::DIALOG_LIB_EDIT_PIN_BASE( wxWindow* parent, wxWindowID
		bLeftSizer->Add( boarderSizer, 0, wxEXPAND\|wxTOP\|wxBOTTOM, 12 );


		bUpperSizer->Add( bLeftSizer, 1, wxEXPAND, 5 );
		bUpperSizer->Add( bLeftSizer, 2, wxEXPAND, 5 );

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

eeschema/dialogs/dialog_lib_edit_pin_base.fbp

+2297 −2383

Original line number	Diff line number	Diff line
		@@ -25,62 +25,28 @@
		<property name="use_enum">1</property>
		<property name="use_microsoft_bom">0</property>
		<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_name"></property>
		<property name="aui_position"></property>
		<property name="aui_row"></property>
		<property name="best_size"></property>
		<property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
		<property name="bg"></property>
		<property name="caption"></property>
		<property name="caption_visible">1</property>
		<property name="center">wxBOTH</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="event_handler">impl_virtual</property>
		<property name="extra_style"></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">DIALOG_LIB_EDIT_PIN_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="resize">Resizable</property>
		<property name="show">1</property>
		<property name="size">-1,-1</property>
		<property name="style">wxDEFAULT_DIALOG_STYLE\|wxRESIZE_BORDER</property>
		<property name="subclass">DIALOG_SHIM; dialog_shim.h</property>
		<property name="title">Pin Properties</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>
		@@ -137,7 +103,7 @@
		<object class="sizeritem" expanded="1">
		<property name="border">5</property>
		<property name="flag">wxEXPAND</property>
		<property name="proportion">1</property>
		<property name="proportion">2</property>
		<object class="wxBoxSizer" expanded="1">
		<property name="minimum_size"></property>
		<property name="name">bLeftSizer</property>
		@@ -213,10 +179,6 @@
		<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>
		@@ -391,10 +353,6 @@
		<property name="subclass"></property>
		<property name="toolbar_pane">0</property>
		<property name="tooltip">Pin number: 1 to 4 ASCII letters and/or digits</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>
		@@ -569,10 +527,6 @@
		<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>
		@@ -747,10 +701,6 @@
		<property name="subclass"></property>
		<property name="toolbar_pane">0</property>
		<property name="tooltip">Used by the ERC.</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>
		@@ -925,10 +875,6 @@
		<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>
		@@ -1435,10 +1381,6 @@
		<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>
		@@ -1613,10 +1555,6 @@
		<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>
		@@ -1700,10 +1638,6 @@
		<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>
		@@ -1878,10 +1812,6 @@
		<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>
		@@ -1965,10 +1895,6 @@
		<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>
		@@ -2143,10 +2069,6 @@
		<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>
		@@ -2230,10 +2152,6 @@
		<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">wxFULL_REPAINT_ON_RESIZE\|wxSUNKEN_BORDER\|wxTAB_TRAVERSAL</property>
		@@ -2319,10 +2237,6 @@
		<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>

eeschema/dialogs/dialog_lib_edit_pin_base.h

+101 −101

Original line number	Diff line number	Diff line
		///////////////////////////////////////////////////////////////////////////
		// C++ code generated with wxFormBuilder (version Mar 17 2012)
		// C++ code generated with wxFormBuilder (version Apr 11 2012)
		// http://www.wxformbuilder.org/
		//
		// PLEASE DO "NOT" EDIT THIS FILE!