: 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;
_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);
_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);
TimecodeBase::size (wxWindow* parent)
{
wxClientDC dc (parent);
- wxSize size = dc.GetTextExtent (wxT ("9999"));
+#ifdef DCPOMATIC_OSX
+ auto size = dc.GetTextExtent(wxT("999"));
+#else
+ auto size = dc.GetTextExtent(wxT("99999"));
+#endif
size.SetHeight (-1);
return size;
}