Move _state_timer into VideoView.

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

diff --git a/src/wx/key_dialog.cc b/src/wx/key_dialog.cc
index 70229c7a90babaebdb7ca5953db533f7803b9c2a..2d8cd4c37afee4dc0f5417b0868b02b6370dd116 100644 (file)
--- a/src/wx/key_dialog.cc
+++ b/src/wx/key_dialog.cc
@@ -1,29 +1,32 @@
 /*
     Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
 #include "key_dialog.h"
 #include "wx_util.h"
+#include "dcpomatic_button.h"
+#include <iostream>
 
 using std::cout;
 
 KeyDialog::KeyDialog (wxWindow* parent, dcp::Key key)
-       : TableDialog (parent, _("Key"), 3, true)
+       : TableDialog (parent, _("Key"), 3, 1, true)
 {
        add (_("Key"), true);
 
@@ -40,15 +43,15 @@ KeyDialog::KeyDialog (wxWindow* parent, dcp::Key key)
         }
 
         validator.SetIncludes (list);
-       
-       _key = add (new wxTextCtrl (this, wxID_ANY, _(""), wxDefaultPosition, size, 0, validator));
+
+       _key = add (new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0, validator));
        _key->SetValue (std_to_wx (key.hex ()));
        _key->SetMaxLength (32);
 
-       _random = add (new wxButton (this, wxID_ANY, _("Random")));
+       _random = add (new Button(this, _("Random")));
 
-       _key->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KeyDialog::key_changed, this));
-       _random->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KeyDialog::random, this));
+       _key->Bind (wxEVT_TEXT, boost::bind (&KeyDialog::key_changed, this));
+       _random->Bind (wxEVT_BUTTON, boost::bind (&KeyDialog::random, this));
 
        layout ();
 }