X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimecode.cc;h=291a6ba5889ab9edd223bf9f309f320638e09cc5;hb=a5e87b6f0f496f4ed71d9129d40a5baebb68495f;hp=bd0a182c2f4d6b1d3dd027875449c31863c25410;hpb=f90d74f7a0382f0dc63eef81bd553d7a7b38edb2;p=dcpomatic.git

diff --git a/src/wx/timecode.cc b/src/wx/timecode.cc
index bd0a182c2..291a6ba58 100644
--- a/src/wx/timecode.cc
+++ b/src/wx/timecode.cc
@@ -29,10 +29,8 @@ using boost::lexical_cast;
 TimecodeBase::TimecodeBase (wxWindow* parent)
 	: wxPanel (parent)
 {
-	wxClientDC dc (parent);
-	wxSize size = dc.GetTextExtent (wxT ("9999"));
-	size.SetHeight (-1);
-
+	wxSize const s = TimecodeBase::size (parent);
+	
 	wxTextValidator validator (wxFILTER_INCLUDE_CHAR_LIST);
 	wxArrayString list;
 
@@ -47,19 +45,19 @@ TimecodeBase::TimecodeBase (wxWindow* parent)
 	
 	_editable = new wxPanel (this);
 	wxSizer* editable_sizer = new wxBoxSizer (wxHORIZONTAL);
-	_hours = new wxTextCtrl (_editable, wxID_ANY, wxT(""), wxDefaultPosition, size, 0, validator);
+	_hours = new wxTextCtrl (_editable, wxID_ANY, wxT(""), wxDefaultPosition, s, 0, validator);
 	_hours->SetMaxLength (2);
 	editable_sizer->Add (_hours);
 	add_label_to_sizer (editable_sizer, _editable, wxT (":"), false);
-	_minutes = new wxTextCtrl (_editable, wxID_ANY, wxT(""), wxDefaultPosition, size, 0, validator);
+	_minutes = new wxTextCtrl (_editable, wxID_ANY, wxT(""), wxDefaultPosition, s, 0, validator);
 	_minutes->SetMaxLength (2);
 	editable_sizer->Add (_minutes);
 	add_label_to_sizer (editable_sizer, _editable, wxT (":"), false);
-	_seconds = new wxTextCtrl (_editable, wxID_ANY, wxT(""), wxDefaultPosition, size, 0, validator);
+	_seconds = new wxTextCtrl (_editable, wxID_ANY, wxT(""), wxDefaultPosition, s, 0, validator);
 	_seconds->SetMaxLength (2);
 	editable_sizer->Add (_seconds);
 	add_label_to_sizer (editable_sizer, _editable, wxT (":"), false);
-	_frames = new wxTextCtrl (_editable, wxID_ANY, wxT(""), wxDefaultPosition, size, 0, validator);
+	_frames = new wxTextCtrl (_editable, wxID_ANY, wxT(""), wxDefaultPosition, s, 0, validator);
 	_frames->SetMaxLength (2);
 	editable_sizer->Add (_frames);
 	_set_button = new wxButton (_editable, wxID_ANY, _("Set"));
@@ -85,11 +83,11 @@ TimecodeBase::TimecodeBase (wxWindow* parent)
 void
 TimecodeBase::clear ()
 {
-	checked_set (_hours, "");
-	checked_set (_minutes, "");
-	checked_set (_seconds, "");
-	checked_set (_frames, "");
-	_fixed->SetLabel ("");
+	checked_set (_hours, wxT (""));
+	checked_set (_minutes, wxT (""));
+	checked_set (_seconds, wxT (""));
+	checked_set (_frames, wxT (""));
+	checked_set (_fixed, wxT (""));
 }
 
 void
@@ -112,3 +110,14 @@ TimecodeBase::set_editable (bool e)
 	_fixed->Show (!e);
 	_sizer->Layout ();
 }
+
+wxSize
+TimecodeBase::size (wxWindow* parent)
+{
+	wxClientDC dc (parent);
+	wxSize size = dc.GetTextExtent (wxT ("9999"));
+	size.SetHeight (-1);
+	return size;
+}
+
+