projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Put Film pointer into Decoder.
[dcpomatic.git]
/
src
/
wx
/
content_colour_conversion_dialog.cc
diff --git
a/src/wx/content_colour_conversion_dialog.cc
b/src/wx/content_colour_conversion_dialog.cc
index 651e1dc6690c3bd032bbc0be69497cf1a2c653b8..100d766f2d50a91579a77604898529645d365a20 100644
(file)
--- a/
src/wx/content_colour_conversion_dialog.cc
+++ b/
src/wx/content_colour_conversion_dialog.cc
@@
-1,19
+1,20
@@
/*
Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2013-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/>.
*/
*/
@@
-50,7
+51,7
@@
ContentColourConversionDialog::ContentColourConversionDialog (wxWindow* parent,
overall_sizer->Add (new wxStaticLine (this, wxID_ANY), 0, wxEXPAND);
overall_sizer->Add (_editor);
overall_sizer->Add (new wxStaticLine (this, wxID_ANY), 0, wxEXPAND);
overall_sizer->Add (_editor);
- wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
+ wxSizer* buttons = CreateSeparatedButtonSizer (wxOK
| wxCANCEL
);
if (buttons) {
overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
}
if (buttons) {
overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
}
@@
-58,8
+59,8
@@
ContentColourConversionDialog::ContentColourConversionDialog (wxWindow* parent,
overall_sizer->Layout ();
overall_sizer->SetSizeHints (this);
overall_sizer->Layout ();
overall_sizer->SetSizeHints (this);
- _preset_check->Bind (wxEVT_C
OMMAND_CHECKBOX_CLICKED
, boost::bind (&ContentColourConversionDialog::preset_check_clicked, this));
- _preset_choice->Bind (wxEVT_C
OMMAND_CHOICE_SELECTED
, boost::bind (&ContentColourConversionDialog::preset_choice_changed, this));
+ _preset_check->Bind (wxEVT_C
HECKBOX
, boost::bind (&ContentColourConversionDialog::preset_check_clicked, this));
+ _preset_choice->Bind (wxEVT_C
HOICE
, boost::bind (&ContentColourConversionDialog::preset_choice_changed, this));
_editor_connection = _editor->Changed.connect (boost::bind (&ContentColourConversionDialog::check_for_preset, this));
_editor_connection = _editor->Changed.connect (boost::bind (&ContentColourConversionDialog::check_for_preset, this));