diff --git a/eeschema/dialogs/dialog_annotate_base.cpp b/eeschema/dialogs/dialog_annotate_base.cpp index ed44cdeaa2..f3d1298054 100644 --- a/eeschema/dialogs/dialog_annotate_base.cpp +++ b/eeschema/dialogs/dialog_annotate_base.cpp @@ -5,8 +5,8 @@ // PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#include "widgets/wx_infobar.h" #include "widgets/wx_html_report_panel.h" +#include "widgets/wx_infobar.h" #include "dialog_annotate_base.h" @@ -67,7 +67,7 @@ DIALOG_ANNOTATE_BASE::DIALOG_ANNOTATE_BASE( wxWindow* parent, wxWindowID id, con bSizerXpos->Add( annotate_down_right_bitmap, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); - sbSizer1->Add( bSizerXpos, 0, wxEXPAND, 5 ); + sbSizer1->Add( bSizerXpos, 0, wxBOTTOM|wxEXPAND, 5 ); wxBoxSizer* bSizerYpos; bSizerYpos = new wxBoxSizer( wxHORIZONTAL ); @@ -75,9 +75,6 @@ DIALOG_ANNOTATE_BASE::DIALOG_ANNOTATE_BASE( wxWindow* parent, wxWindowID id, con m_rbSortBy_Y_Position = new wxRadioButton( sbSizer1->GetStaticBox(), ID_SORT_BY_Y_POSITION, _("Sort symbols by &Y position"), wxDefaultPosition, wxDefaultSize, 0 ); bSizerYpos->Add( m_rbSortBy_Y_Position, 0, wxALIGN_CENTER_VERTICAL, 3 ); - - bSizerYpos->Add( 0, 0, 1, 0, 5 ); - annotate_right_down_bitmap = new wxStaticBitmap( sbSizer1->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); bSizerYpos->Add( annotate_right_down_bitmap, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); diff --git a/eeschema/dialogs/dialog_annotate_base.fbp b/eeschema/dialogs/dialog_annotate_base.fbp index 494f55daee..8756f9076d 100644 --- a/eeschema/dialogs/dialog_annotate_base.fbp +++ b/eeschema/dialogs/dialog_annotate_base.fbp @@ -114,7 +114,7 @@ 1 wxSHOW_EFFECT_NONE - WX_INFOBAR; widgets/infobar.h; forward_declare + WX_INFOBAR; widgets/wx_infobar.h; forward_declare 0 @@ -431,7 +431,7 @@ none 5 - wxEXPAND + wxBOTTOM|wxEXPAND 0 @@ -637,16 +637,6 @@ OnOptionChanged - - 5 - - 1 - - 0 - protected - 0 - - 5 wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT