From fd017b52ace89335d575e58ef139bbe3705e45a2 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Thu, 21 Jun 2012 04:32:10 +0000 Subject: [PATCH] Fix incorrectly positioned controls in the fonts collector dialog The documentation claims that making things in static boxes children of the static box is the right thing to do, but it's broken things a few times now, so just make them children of the static box's parent. Originally committed to SVN as r6912. --- aegisub/src/dialog_fonts_collector.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/aegisub/src/dialog_fonts_collector.cpp b/aegisub/src/dialog_fonts_collector.cpp index 2d73c5fda..88e3e9621 100644 --- a/aegisub/src/dialog_fonts_collector.cpp +++ b/aegisub/src/dialog_fonts_collector.cpp @@ -234,9 +234,9 @@ DialogFontsCollector::DialogFontsCollector(agi::Context *c) wxStaticBoxSizer *destination_box = new wxStaticBoxSizer(wxVERTICAL, this, _("Destination")); - dest_label = new wxStaticText(destination_box->GetStaticBox(), -1, " "); - dest_ctrl = new wxTextCtrl(destination_box->GetStaticBox(), -1, StandardPaths::DecodePath(lagi_wxString(OPT_GET("Path/Fonts Collector Destination")->GetString()))); - dest_browse_button = new wxButton(destination_box->GetStaticBox(), -1, _("&Browse...")); + dest_label = new wxStaticText(this, -1, " "); + dest_ctrl = new wxTextCtrl(this, -1, StandardPaths::DecodePath(lagi_wxString(OPT_GET("Path/Fonts Collector Destination")->GetString()))); + dest_browse_button = new wxButton(this, -1, _("&Browse...")); wxSizer *dest_browse_sizer = new wxBoxSizer(wxHORIZONTAL); dest_browse_sizer->Add(dest_ctrl, wxSizerFlags(1).Border(wxRIGHT).Align(wxALIGN_CENTER_VERTICAL)); @@ -246,7 +246,7 @@ DialogFontsCollector::DialogFontsCollector(agi::Context *c) destination_box->Add(dest_browse_sizer, wxSizerFlags().Expand()); wxStaticBoxSizer *log_box = new wxStaticBoxSizer(wxVERTICAL, this, _("Log")); - collection_log = new ScintillaTextCtrl(log_box->GetStaticBox(), -1, "", wxDefaultPosition, wxSize(600, 300)); + collection_log = new ScintillaTextCtrl(this, -1, "", wxDefaultPosition, wxSize(600, 300)); collection_log->SetWrapMode(wxSTC_WRAP_WORD); collection_log->SetMarginWidth(1, 0); collection_log->SetReadOnly(true);