X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimecode.cc;h=754483c0c2ce08407bc11c9d4af682937ac1f095;hb=54819e695ac39ad62f2633ae10cdcf51adb4d810;hp=5890f30b58b33e143f81c90cd6f3bdfa2aa1144e;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git

diff --git a/src/wx/timecode.cc b/src/wx/timecode.cc
index 5890f30b5..754483c0c 100644
--- a/src/wx/timecode.cc
+++ b/src/wx/timecode.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,16 +18,18 @@
 
 */
 
-#include "lib/util.h"
 #include "timecode.h"
 #include "wx_util.h"
+#include "dcpomatic_button.h"
+#include "lib/util.h"
 #include <iostream>
 
 using std::string;
 using std::cout;
 
-TimecodeBase::TimecodeBase (wxWindow* parent)
+TimecodeBase::TimecodeBase (wxWindow* parent, bool set_button)
 	: wxPanel (parent)
+	, _set_button (0)
 {
 	wxSize const s = TimecodeBase::size (parent);
 
@@ -60,26 +62,35 @@ TimecodeBase::TimecodeBase (wxWindow* parent)
 	_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"));
-	editable_sizer->Add (_set_button, 0, wxLEFT | wxRIGHT, 8);
+	if (set_button) {
+		_set_button = new Button (_editable, _("Set"));
+		editable_sizer->Add (_set_button, 0, wxLEFT | wxRIGHT, 8);
+	}
 	_editable->SetSizerAndFit (editable_sizer);
 	_sizer->Add (_editable);
 
 	_fixed = add_label_to_sizer (_sizer, this, wxT ("42"), false);
 
-	_hours->Bind	  (wxEVT_COMMAND_TEXT_UPDATED,   boost::bind (&TimecodeBase::changed, this));
-	_minutes->Bind	  (wxEVT_COMMAND_TEXT_UPDATED,   boost::bind (&TimecodeBase::changed, this));
-	_seconds->Bind	  (wxEVT_COMMAND_TEXT_UPDATED,   boost::bind (&TimecodeBase::changed, this));
-	_frames->Bind	  (wxEVT_COMMAND_TEXT_UPDATED,   boost::bind (&TimecodeBase::changed, this));
-	_set_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&TimecodeBase::set_clicked, this));
-
-	_set_button->Enable (false);
+	_hours->Bind	  (wxEVT_TEXT,   boost::bind (&TimecodeBase::changed, this));
+	_minutes->Bind	  (wxEVT_TEXT,   boost::bind (&TimecodeBase::changed, this));
+	_seconds->Bind	  (wxEVT_TEXT,   boost::bind (&TimecodeBase::changed, this));
+	_frames->Bind	  (wxEVT_TEXT,   boost::bind (&TimecodeBase::changed, this));
+	if (_set_button) {
+		_set_button->Bind (wxEVT_BUTTON, boost::bind (&TimecodeBase::set_clicked, this));
+		_set_button->Enable (false);
+	}
 
 	set_editable (true);
 
 	SetSizerAndFit (_sizer);
 }
 
+void
+TimecodeBase::set_focus ()
+{
+	_hours->SetFocus ();
+}
+
 void
 TimecodeBase::clear ()
 {
@@ -93,14 +104,18 @@ TimecodeBase::clear ()
 void
 TimecodeBase::changed ()
 {
-	_set_button->Enable (true);
+	if (_set_button) {
+		_set_button->Enable (true);
+	}
 }
 
 void
 TimecodeBase::set_clicked ()
 {
 	Changed ();
-	_set_button->Enable (false);
+	if (_set_button) {
+		_set_button->Enable (false);
+	}
 }
 
 void