From f5e23e4f1ad34884cdd0fae979f2346e13705ccc Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Sun, 29 Jul 2018 12:54:36 +0200 Subject: [PATCH] Fix a few wxWidgets minor asserts --- .../dialogs/dialog_edit_libentry_fields_in_lib_base.cpp | 6 +++--- .../dialogs/dialog_edit_libentry_fields_in_lib_base.fbp | 5 +++-- eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.h | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp b/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp index d731f77b04..31bb9e8d3a 100644 --- a/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp +++ b/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Dec 30 2017) +// C++ code generated with wxFormBuilder (version Jun 5 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -113,7 +113,7 @@ DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE bSizerButtons->Add( 0, 0, 1, wxEXPAND, 5 ); m_spiceFieldsButton = new wxButton( this, wxID_ANY, _(" Edit Spice Model... "), wxDefaultPosition, wxDefaultSize, 0 ); - bSizerButtons->Add( m_spiceFieldsButton, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + bSizerButtons->Add( m_spiceFieldsButton, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); bSizerButtons->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); @@ -125,7 +125,7 @@ DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE stdDialogButtonSizer->AddButton( stdDialogButtonSizerCancel ); stdDialogButtonSizer->Realize(); - bSizerButtons->Add( stdDialogButtonSizer, 0, wxEXPAND|wxALL, 6 ); + bSizerButtons->Add( stdDialogButtonSizer, 0, wxALL|wxALIGN_CENTER_VERTICAL, 6 ); mainSizer->Add( bSizerButtons, 0, wxEXPAND, 5 ); diff --git a/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.fbp b/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.fbp index d9c34b3ffa..562517f1d3 100644 --- a/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.fbp +++ b/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.fbp @@ -14,6 +14,7 @@ dialog_edit_libentry_fields_in_lib_base 1000 none + 1 DialogEditLibentryFields_in_lib_base @@ -742,7 +743,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL + wxALIGN_CENTER_VERTICAL|wxALL 0 1 @@ -840,7 +841,7 @@ 6 - wxEXPAND|wxALL + wxALL|wxALIGN_CENTER_VERTICAL 0 0 diff --git a/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.h b/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.h index e1ddf8953c..4294babe0c 100644 --- a/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.h +++ b/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Dec 30 2017) +// C++ code generated with wxFormBuilder (version Jun 5 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE!