From 9ae508730deefbc6e4ecbd58f4649cfc273e4fcd Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Tue, 28 Jul 2015 17:05:50 -0700 Subject: [PATCH] Remove some incorrect and ignored sizer flags --- src/dialog_style_editor.cpp | 8 ++++---- src/dialog_style_manager.cpp | 2 +- src/preferences.cpp | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/dialog_style_editor.cpp b/src/dialog_style_editor.cpp index 257ddd957..039caee17 100644 --- a/src/dialog_style_editor.cpp +++ b/src/dialog_style_editor.cpp @@ -145,7 +145,7 @@ DialogStyleEditor::DialogStyleEditor(wxWindow *parent, AssStyle *style, agi::Con SetIcon(GETICON(style_toolbutton_16)); auto add_with_label = [&](wxSizer *sizer, wxString const& label, wxWindow *ctrl) { - sizer->Add(new wxStaticText(this, -1, label), wxSizerFlags().Center().Right().Border(wxLEFT | wxRIGHT)); + sizer->Add(new wxStaticText(this, -1, label), wxSizerFlags().Center().Border(wxLEFT | wxRIGHT)); sizer->Add(ctrl, wxSizerFlags(1).Left().Expand()); }; @@ -318,8 +318,8 @@ DialogStyleEditor::DialogStyleEditor(wxWindow *parent, AssStyle *style, agi::Con wxSizer *MiscBoxBottom = new wxBoxSizer(wxHORIZONTAL); add_with_label(MiscBoxBottom, _("Encoding:"), Encoding); - MiscBox->Add(MiscBoxTop, wxSizerFlags().Expand().Center()); - MiscBox->Add(MiscBoxBottom, wxSizerFlags().Expand().Center().Border(wxTOP)); + MiscBox->Add(MiscBoxTop, wxSizerFlags().Expand()); + MiscBox->Add(MiscBoxBottom, wxSizerFlags().Expand().Border(wxTOP)); // Preview auto previewButton = new ColourButton(this, wxSize(45, 16), false, OPT_GET("Colour/Style Editor/Background/Preview")->GetColor()); @@ -361,7 +361,7 @@ DialogStyleEditor::DialogStyleEditor(wxWindow *parent, AssStyle *style, agi::Con // General Layout wxSizer *MainSizer = new wxBoxSizer(wxVERTICAL); - MainSizer->Add(ControlSizer, 1, wxALL | wxALIGN_CENTER | wxEXPAND, 5); + MainSizer->Add(ControlSizer, 1, wxALL | wxEXPAND, 5); MainSizer->Add(ButtonSizer, 0, wxBOTTOM | wxEXPAND, 5); SetSizerAndFit(MainSizer); diff --git a/src/dialog_style_manager.cpp b/src/dialog_style_manager.cpp index 5e63537a8..706ea7146 100644 --- a/src/dialog_style_manager.cpp +++ b/src/dialog_style_manager.cpp @@ -275,7 +275,7 @@ DialogStyleManager::DialogStyleManager(agi::Context *context) CatalogList = new wxComboBox(this,-1, "", wxDefaultPosition, wxSize(-1,-1), 0, nullptr, wxCB_READONLY); wxButton *CatalogNew = new wxButton(this, -1, _("New")); CatalogDelete = new wxButton(this, -1, _("Delete")); - CatalogBox->Add(CatalogList,1,wxEXPAND | wxRIGHT | wxALIGN_RIGHT,5); + CatalogBox->Add(CatalogList,1,wxEXPAND | wxRIGHT,5); CatalogBox->Add(CatalogNew,0,wxRIGHT,5); CatalogBox->Add(CatalogDelete,0,0,0); diff --git a/src/preferences.cpp b/src/preferences.cpp index c7c4f6d0c..93cac807c 100644 --- a/src/preferences.cpp +++ b/src/preferences.cpp @@ -599,9 +599,9 @@ Interface_Hotkeys::Interface_Hotkeys(wxTreebook *book, Preferences *parent) wxSizer *buttons = new wxBoxSizer(wxHORIZONTAL); buttons->Add(quick_search, wxSizerFlags().Border()); buttons->AddStretchSpacer(1); - buttons->Add(new_button, wxSizerFlags().Border().Right()); - buttons->Add(edit_button, wxSizerFlags().Border().Right()); - buttons->Add(delete_button, wxSizerFlags().Border().Right()); + buttons->Add(new_button, wxSizerFlags().Border()); + buttons->Add(edit_button, wxSizerFlags().Border()); + buttons->Add(delete_button, wxSizerFlags().Border()); sizer->Add(buttons, wxSizerFlags().Expand()); sizer->Add(dvc, wxSizerFlags(1).Expand().Border(wxLEFT | wxRIGHT));