Move _state_timer into VideoView.

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

diff --git a/src/wx/timecode.cc b/src/wx/timecode.cc
index 454614a1b16bf7473a03ded8aebd5b9608ac340f..754483c0c2ce08407bc11c9d4af682937ac1f095 100644 (file)
--- a/src/wx/timecode.cc
+++ b/src/wx/timecode.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,9 +18,10 @@
 
 */
 
-#include "lib/util.h"
 #include "timecode.h"
 #include "wx_util.h"
+#include "dcpomatic_button.h"
+#include "lib/util.h"
 #include <iostream>
 
 using std::string;
@@ -62,7 +63,7 @@ TimecodeBase::TimecodeBase (wxWindow* parent, bool set_button)
        _frames->SetMaxLength (2);
        editable_sizer->Add (_frames);
        if (set_button) {
-               _set_button = new wxButton (_editable, wxID_ANY, _("Set"));
+               _set_button = new Button (_editable, _("Set"));
                editable_sizer->Add (_set_button, 0, wxLEFT | wxRIGHT, 8);
        }
        _editable->SetSizerAndFit (editable_sizer);
@@ -70,12 +71,12 @@ TimecodeBase::TimecodeBase (wxWindow* parent, bool set_button)
 
        _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));
+       _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_COMMAND_BUTTON_CLICKED, boost::bind (&TimecodeBase::set_clicked, this));
+               _set_button->Bind (wxEVT_BUTTON, boost::bind (&TimecodeBase::set_clicked, this));
                _set_button->Enable (false);
        }