From a52488150539d5a4af8e08cd05d8833fddef0be1 Mon Sep 17 00:00:00 2001 From: Niels Martin Hansen Date: Wed, 4 Apr 2007 02:54:03 +0000 Subject: [PATCH] Misc. sizer tweaks Originally committed to SVN as r997. --- aegisub/dialog_dummy_video.cpp | 4 ++-- aegisub/dialog_options.cpp | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/aegisub/dialog_dummy_video.cpp b/aegisub/dialog_dummy_video.cpp index ac9762cbe..1820595e5 100644 --- a/aegisub/dialog_dummy_video.cpp +++ b/aegisub/dialog_dummy_video.cpp @@ -150,8 +150,8 @@ DialogDummyVideo::DialogDummyVideo(wxWindow *parent) fg->AddStretchSpacer(); fg->Add(length_display, 0, wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxALIGN_LEFT); wxBoxSizer *main_sizer = new wxBoxSizer(wxVERTICAL); - main_sizer->Add(fg, 0, wxALL, 5); - main_sizer->Add(CreateButtonSizer(wxOK|wxCANCEL), 0, wxLEFT|wxRIGHT|wxBOTTOM, 5); + main_sizer->Add(fg, 0, wxALL|wxEXPAND, 5); + main_sizer->Add(CreateSeparatedButtonSizer(wxOK|wxCANCEL), 0, wxALL|wxEXPAND, 5); ok_button = static_cast(FindWindow(wxID_OK)); cancel_button = static_cast(FindWindow(wxID_CANCEL)); diff --git a/aegisub/dialog_options.cpp b/aegisub/dialog_options.cpp index bbdcfb575..2cd34976f 100644 --- a/aegisub/dialog_options.cpp +++ b/aegisub/dialog_options.cpp @@ -579,10 +579,11 @@ DialogOptions::DialogOptions(wxWindow *parent) #endif // Buttons Sizer + //wxStdDialogButtonSizer *buttonSizer = static_cast(CreateButtonSizer(wxOK|wxCANCEL)); wxStdDialogButtonSizer *buttonSizer = new wxStdDialogButtonSizer(); - buttonSizer->Add(new wxButton(this,wxID_OK)); - buttonSizer->Add(new wxButton(this,wxID_CANCEL)); - buttonSizer->Add(new wxButton(this,wxID_APPLY)); + buttonSizer->AddButton(new wxButton(this,wxID_OK)); + buttonSizer->AddButton(new wxButton(this,wxID_CANCEL)); + buttonSizer->AddButton(new wxButton(this,wxID_APPLY)); buttonSizer->Realize(); // Main Sizer