From 4bb88670bb6bc0fdba438d994734a3dea6b26d88 Mon Sep 17 00:00:00 2001 From: Niels Martin Hansen Date: Tue, 2 Oct 2007 19:11:06 +0000 Subject: [PATCH] Make video zoom dropdown on the toolbar and the subs edit area Commit button both use default sizes. Originally committed to SVN as r1594. --- aegisub/frame_main.cpp | 2 +- aegisub/subs_edit_box.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aegisub/frame_main.cpp b/aegisub/frame_main.cpp index 88e0f1eae..c1e9eafa3 100644 --- a/aegisub/frame_main.cpp +++ b/aegisub/frame_main.cpp @@ -211,7 +211,7 @@ void FrameMain::InitToolbar () { toAdd += _T("%"); choices.Add(toAdd); } - ZoomBox = new wxComboBox(Toolbar,Toolbar_Zoom_Dropdown,_T("75%"),wxDefaultPosition,wxSize(100,20),choices,wxCB_READONLY); + ZoomBox = new wxComboBox(Toolbar,Toolbar_Zoom_Dropdown,_T("75%"),wxDefaultPosition,wxDefaultSize,choices,wxCB_READONLY); Toolbar->AddControl(ZoomBox); Toolbar->AddSeparator(); diff --git a/aegisub/subs_edit_box.cpp b/aegisub/subs_edit_box.cpp index 95c2abeba..f96168b42 100644 --- a/aegisub/subs_edit_box.cpp +++ b/aegisub/subs_edit_box.cpp @@ -132,7 +132,7 @@ SubsEditBox::SubsEditBox (wxWindow *parent,SubtitlesGrid *gridp) : wxPanel(paren Color3->SetToolTip(_("Outline color")); Color4 = new wxBitmapButton(this,BUTTON_COLOR4,wxBITMAP(button_color_four),wxDefaultPosition,wxSize(30,20)); Color4->SetToolTip(_("Shadow color")); - CommitButton = new wxButton(this,BUTTON_COMMIT,_("Commit"),wxDefaultPosition,wxSize(-1,20)); + CommitButton = new wxButton(this,BUTTON_COMMIT,_("Commit"),wxDefaultPosition,wxDefaultSize); ToolTipManager::Bind(CommitButton,_("Commits the text (Enter). Hold Ctrl to stay in line (%KEY%)."),_T("Edit Box Commit")); ByTime = new wxRadioButton(this,RADIO_TIME_BY_TIME,_("Time"),wxDefaultPosition,wxDefaultSize,wxRB_GROUP); ByTime->SetToolTip(_("Time by h:mm:ss.cs"));