More c++ tidying.

[dcpomatic.git] / src / wx / timecode.cc

diff --git a/src/wx/timecode.cc b/src/wx/timecode.cc
index 684f29b197aa886c11fd28aa9933efb38ce54e67..c4755e5745063c9a8fb007aa5a39266777bef642 100644 (file)
--- a/src/wx/timecode.cc
+++ b/src/wx/timecode.cc
@@ -31,7 +31,7 @@ TimecodeBase::TimecodeBase (wxWindow* parent, bool set_button)
        : wxPanel (parent)
        , _set_button (0)
 {
-       wxSize const s = TimecodeBase::size (parent);
+       auto const s = TimecodeBase::size (parent);
 
        wxTextValidator validator (wxFILTER_INCLUDE_CHAR_LIST);
        wxArrayString list;
@@ -46,7 +46,7 @@ TimecodeBase::TimecodeBase (wxWindow* parent, bool set_button)
        _sizer = new wxBoxSizer (wxHORIZONTAL);
 
        _editable = new wxPanel (this);
-       wxSizer* editable_sizer = new wxBoxSizer (wxHORIZONTAL);
+       auto editable_sizer = new wxBoxSizer (wxHORIZONTAL);
        _hours = new wxTextCtrl (_editable, wxID_ANY, wxT(""), wxDefaultPosition, s, 0, validator);
        _hours->SetMaxLength (2);
        editable_sizer->Add (_hours);
@@ -62,8 +62,9 @@ TimecodeBase::TimecodeBase (wxWindow* parent, bool set_button)
        _frames = new wxTextCtrl (_editable, wxID_ANY, wxT(""), wxDefaultPosition, s, 0, validator);
        _frames->SetMaxLength (2);
        editable_sizer->Add (_frames);
+
        if (set_button) {
-               _set_button = new Button (_editable, _("Set"));
+               _set_button = new Button (_editable, _("Set"), wxDefaultPosition, small_button_size(parent, _("Set")));
                editable_sizer->Add (_set_button, 0, wxLEFT | wxRIGHT, 8);
        }
        _editable->SetSizerAndFit (editable_sizer);
@@ -130,7 +131,7 @@ wxSize
 TimecodeBase::size (wxWindow* parent)
 {
        wxClientDC dc (parent);
-       wxSize size = dc.GetTextExtent (wxT ("9999"));
+       auto size = dc.GetTextExtent(wxT("9999"));
        size.SetHeight (-1);
        return size;
 }