projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull methods out of CinemaKDMs.
[dcpomatic.git]
/
src
/
wx
/
key_dialog.cc
diff --git
a/src/wx/key_dialog.cc
b/src/wx/key_dialog.cc
index 01f7e44a891337335bf56bbe29fc1057127e9569..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>
/*
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.
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
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 "key_dialog.h"
#include "wx_util.h"
+#include "dcpomatic_button.h"
+#include <iostream>
using std::cout;
KeyDialog::KeyDialog (wxWindow* parent, dcp::Key key)
using std::cout;
KeyDialog::KeyDialog (wxWindow* parent, dcp::Key key)
- : TableDialog (parent, _("Key"), 3, true)
+ : TableDialog (parent, _("Key"), 3,
1,
true)
{
add (_("Key"), true);
{
add (_("Key"), true);
@@
-45,10
+48,10
@@
KeyDialog::KeyDialog (wxWindow* parent, dcp::Key key)
_key->SetValue (std_to_wx (key.hex ()));
_key->SetMaxLength (32);
_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 ();
}
layout ();
}