From c3a4c40d4c17e4f5f58f28202095de7490310a59 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Wed, 27 Oct 2021 17:17:17 +0200 Subject: [PATCH] DIALOG_CHANGE_SYMBOLS: add missing skip event in wxFocusEvents. Fixes #9467 https://gitlab.com/kicad/code/kicad/issues/9467 --- eeschema/dialogs/dialog_change_symbols.cpp | 3 +++ eeschema/dialogs/dialog_change_symbols_base.cpp | 2 +- eeschema/dialogs/dialog_change_symbols_base.fbp | 9 ++++++++- eeschema/dialogs/dialog_change_symbols_base.h | 5 +++-- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/eeschema/dialogs/dialog_change_symbols.cpp b/eeschema/dialogs/dialog_change_symbols.cpp index ce5a01cdc9..afce22ff31 100644 --- a/eeschema/dialogs/dialog_change_symbols.cpp +++ b/eeschema/dialogs/dialog_change_symbols.cpp @@ -203,18 +203,21 @@ void DIALOG_CHANGE_SYMBOLS::onMatchById( wxCommandEvent& aEvent ) void DIALOG_CHANGE_SYMBOLS::onMatchTextKillFocus( wxFocusEvent& event ) { updateFieldsList(); + event.Skip(); // Mandatory in wxFocusEvent } void DIALOG_CHANGE_SYMBOLS::onMatchIDKillFocus( wxFocusEvent& event ) { updateFieldsList(); + event.Skip(); // Mandatory in wxFocusEvent } void DIALOG_CHANGE_SYMBOLS::onNewLibIDKillFocus( wxFocusEvent& event ) { updateFieldsList(); + event.Skip(); // Mandatory in wxFocusEvent } diff --git a/eeschema/dialogs/dialog_change_symbols_base.cpp b/eeschema/dialogs/dialog_change_symbols_base.cpp index f44804de91..e41b20b04a 100644 --- a/eeschema/dialogs/dialog_change_symbols_base.cpp +++ b/eeschema/dialogs/dialog_change_symbols_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version 3.10.0-39-g3487c3cb) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/eeschema/dialogs/dialog_change_symbols_base.fbp b/eeschema/dialogs/dialog_change_symbols_base.fbp index 8a81aba8e7..cc397854df 100644 --- a/eeschema/dialogs/dialog_change_symbols_base.fbp +++ b/eeschema/dialogs/dialog_change_symbols_base.fbp @@ -1,6 +1,6 @@ - + ; C++ @@ -14,6 +14,7 @@ dialog_change_symbols_base 1000 none + 1 dialog_change_symbols_base @@ -25,6 +26,7 @@ 1 1 UI + 0 0 0 @@ -50,6 +52,7 @@ DIALOG_SHIM; dialog_shim.h; forward_declare Update Symbols from Library + 0 @@ -643,6 +646,7 @@ + 0 @@ -932,6 +936,7 @@ + 0 @@ -1102,6 +1107,7 @@ + 0 @@ -1175,6 +1181,7 @@ + 0 diff --git a/eeschema/dialogs/dialog_change_symbols_base.h b/eeschema/dialogs/dialog_change_symbols_base.h index b38c78d225..ee012fba68 100644 --- a/eeschema/dialogs/dialog_change_symbols_base.h +++ b/eeschema/dialogs/dialog_change_symbols_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version 3.10.0-39-g3487c3cb) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -78,7 +78,7 @@ class DIALOG_CHANGE_SYMBOLS_BASE : public DIALOG_SHIM wxButton* m_sdbSizerOK; wxButton* m_sdbSizerCancel; - // Virtual event handlers, overide them in your derived class + // Virtual event handlers, override them in your derived class virtual void onMatchByAll( wxCommandEvent& event ) { event.Skip(); } virtual void onMatchBySelected( wxCommandEvent& event ) { event.Skip(); } virtual void onMatchByReference( wxCommandEvent& event ) { event.Skip(); } @@ -98,6 +98,7 @@ class DIALOG_CHANGE_SYMBOLS_BASE : public DIALOG_SHIM public: DIALOG_CHANGE_SYMBOLS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Update Symbols from Library"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + ~DIALOG_CHANGE_SYMBOLS_BASE(); };