From df15e63d41f66ec243188c406ebb33e1371db4a3 Mon Sep 17 00:00:00 2001
From: Ingo Kletti <ikletti@htwg-konstanz.de>
Date: Mon, 16 Oct 2017 20:07:26 +0200
Subject: [PATCH] Fix Unit naming typo in eeschema spice model config
---
eeschema/dialogs/dialog_spice_model_base.cpp | 8 ++++----
eeschema/dialogs/dialog_spice_model_base.fbp | 12 ++++++++++--
eeschema/dialogs/dialog_spice_model_base.h | 18 +++++++++---------
3 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/eeschema/dialogs/dialog_spice_model_base.cpp b/eeschema/dialogs/dialog_spice_model_base.cpp
index b85b0ee7a7..0d1816554a 100644
--- a/eeschema/dialogs/dialog_spice_model_base.cpp
+++ b/eeschema/dialogs/dialog_spice_model_base.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version May 6 2016)
+// C++ code generated with wxFormBuilder (version Aug 4 2017)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
@@ -82,9 +82,9 @@ DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID i
m_staticText341->Wrap( -1 );
fgSizerUnitSymbols->Add( m_staticText341, 0, wxALL, 5 );
- m_staticText351 = new wxStaticText( m_passive, wxID_ANY, _("fempto"), wxDefaultPosition, wxDefaultSize, 0 );
- m_staticText351->Wrap( -1 );
- fgSizerUnitSymbols->Add( m_staticText351, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+ m_staticText_femto = new wxStaticText( m_passive, wxID_ANY, _("femto"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_staticText_femto->Wrap( -1 );
+ fgSizerUnitSymbols->Add( m_staticText_femto, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
m_staticText36 = new wxStaticText( m_passive, wxID_ANY, _("1e-15"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText36->Wrap( -1 );
diff --git a/eeschema/dialogs/dialog_spice_model_base.fbp b/eeschema/dialogs/dialog_spice_model_base.fbp
index ea9cdf1465..d83c5d9d77 100644
--- a/eeschema/dialogs/dialog_spice_model_base.fbp
+++ b/eeschema/dialogs/dialog_spice_model_base.fbp
@@ -422,6 +422,8 @@
<property name="window_style"></property>
<event name="OnChar"></event>
<event name="OnCombobox"></event>
+ <event name="OnComboboxCloseup"></event>
+ <event name="OnComboboxDropdown"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
@@ -1177,7 +1179,7 @@
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
- <property name="label">fempto</property>
+ <property name="label">femto</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
@@ -1185,7 +1187,7 @@
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
- <property name="name">m_staticText351</property>
+ <property name="name">m_staticText_femto</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
@@ -3548,6 +3550,8 @@
<property name="window_style"></property>
<event name="OnChar"></event>
<event name="OnCombobox"></event>
+ <event name="OnComboboxCloseup"></event>
+ <event name="OnComboboxDropdown"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
@@ -3732,6 +3736,8 @@
<property name="window_style"></property>
<event name="OnChar"></event>
<event name="OnCombobox"></event>
+ <event name="OnComboboxCloseup"></event>
+ <event name="OnComboboxDropdown"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
@@ -4271,6 +4277,8 @@
<property name="window_style"></property>
<event name="OnChar"></event>
<event name="OnCombobox"></event>
+ <event name="OnComboboxCloseup"></event>
+ <event name="OnComboboxDropdown"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
diff --git a/eeschema/dialogs/dialog_spice_model_base.h b/eeschema/dialogs/dialog_spice_model_base.h
index 8ac0bf293b..afae7e6a92 100644
--- a/eeschema/dialogs/dialog_spice_model_base.h
+++ b/eeschema/dialogs/dialog_spice_model_base.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version May 6 2016)
+// C++ code generated with wxFormBuilder (version Aug 4 2017)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
@@ -45,7 +45,7 @@ class DIALOG_SHIM;
class DIALOG_SPICE_MODEL_BASE : public DIALOG_SHIM
{
private:
-
+
protected:
wxNotebook* m_notebook;
wxPanel* m_passive;
@@ -59,7 +59,7 @@ class DIALOG_SPICE_MODEL_BASE : public DIALOG_SHIM
wxStaticText* m_staticText32;
wxStaticText* m_staticText321;
wxStaticText* m_staticText341;
- wxStaticText* m_staticText351;
+ wxStaticText* m_staticText_femto;
wxStaticText* m_staticText36;
wxStaticText* m_staticText37;
wxStaticText* m_staticText38;
@@ -168,20 +168,20 @@ class DIALOG_SPICE_MODEL_BASE : public DIALOG_SHIM
wxStdDialogButtonSizer* m_sdbSizer;
wxButton* m_sdbSizerOK;
wxButton* m_sdbSizerCancel;
-
+
// Virtual event handlers, overide them in your derived class
virtual void onInitDlg( wxInitDialogEvent& event ) { event.Skip(); }
virtual void onSemiSelectLib( wxCommandEvent& event ) { event.Skip(); }
virtual void onSelectIcLib( wxCommandEvent& event ) { event.Skip(); }
virtual void onPwlAdd( wxCommandEvent& event ) { event.Skip(); }
virtual void onPwlRemove( wxCommandEvent& event ) { event.Skip(); }
-
-
+
+
public:
-
- DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 640,582 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+
+ DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 640,582 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
~DIALOG_SPICE_MODEL_BASE();
-
+
};
#endif //__DIALOG_SPICE_MODEL_BASE_H__