X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_colour_conversion_dialog.cc;h=54f56f432cb041ebeaa7d5a128afa5f22f66de18;hb=b9a1ad3df5f9d85fb7439efd93fede72b9b078af;hp=651e1dc6690c3bd032bbc0be69497cf1a2c653b8;hpb=71d56fbe3ba5974505469d2c8b7efcdef4eb8adc;p=dcpomatic.git

diff --git a/src/wx/content_colour_conversion_dialog.cc b/src/wx/content_colour_conversion_dialog.cc
index 651e1dc66..54f56f432 100644
--- a/src/wx/content_colour_conversion_dialog.cc
+++ b/src/wx/content_colour_conversion_dialog.cc
@@ -1,47 +1,54 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 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 "check_box.h"
+#include "colour_conversion_editor.h"
+#include "content_colour_conversion_dialog.h"
+#include "wx_util.h"
 #include "lib/colour_conversion.h"
 #include "lib/config.h"
 #include "lib/util.h"
-#include "wx_util.h"
-#include "content_colour_conversion_dialog.h"
-#include "colour_conversion_editor.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/statline.h>
-#include <boost/foreach.hpp>
+DCPOMATIC_ENABLE_WARNINGS
 #include <iostream>
 
+
+using std::cout;
 using std::string;
 using std::vector;
-using std::cout;
 using boost::optional;
 
+
 ContentColourConversionDialog::ContentColourConversionDialog (wxWindow* parent, bool yuv)
 	: wxDialog (parent, wxID_ANY, _("Colour conversion"))
-	, _editor (new ColourConversionEditor (this, yuv))
+	, _editor (new ColourConversionEditor(this, yuv))
 	, _setting (false)
 {
-	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
+	auto overall_sizer = new wxBoxSizer (wxVERTICAL);
 	SetSizer (overall_sizer);
 
-	wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_Y_GAP - 2, DCPOMATIC_SIZER_X_GAP);
-	_preset_check = new wxCheckBox (this, wxID_ANY, _("Use preset"));
+	auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_Y_GAP - 2, DCPOMATIC_SIZER_X_GAP);
+	_preset_check = new CheckBox (this, _("Use preset"));
 	table->Add (_preset_check, 0, wxALIGN_CENTER_VERTICAL);
 	_preset_choice = new wxChoice (this, wxID_ANY);
 	table->Add (_preset_choice);
@@ -50,7 +57,7 @@ ContentColourConversionDialog::ContentColourConversionDialog (wxWindow* parent,
 	overall_sizer->Add (new wxStaticLine (this, wxID_ANY), 0, wxEXPAND);
 	overall_sizer->Add (_editor);
 
-	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
+	auto buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL);
 	if (buttons) {
 		overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
 	}
@@ -58,22 +65,24 @@ ContentColourConversionDialog::ContentColourConversionDialog (wxWindow* parent,
 	overall_sizer->Layout ();
 	overall_sizer->SetSizeHints (this);
 
-	_preset_check->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&ContentColourConversionDialog::preset_check_clicked, this));
-	_preset_choice->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&ContentColourConversionDialog::preset_choice_changed, this));
+	_preset_check->Bind (wxEVT_CHECKBOX, boost::bind (&ContentColourConversionDialog::preset_check_clicked, this));
+	_preset_choice->Bind (wxEVT_CHOICE, boost::bind (&ContentColourConversionDialog::preset_choice_changed, this));
 
 	_editor_connection = _editor->Changed.connect (boost::bind (&ContentColourConversionDialog::check_for_preset, this));
 
-	BOOST_FOREACH (PresetColourConversion const &i, PresetColourConversion::all ()) {
+	for (auto const& i: PresetColourConversion::all ()) {
 		_preset_choice->Append (std_to_wx (i.name));
 	}
 }
 
+
 ColourConversion
 ContentColourConversionDialog::get () const
 {
 	return _editor->get ();
 }
 
+
 void
 ContentColourConversionDialog::set (ColourConversion c)
 {
@@ -84,6 +93,7 @@ ContentColourConversionDialog::set (ColourConversion c)
 	check_for_preset ();
 }
 
+
 void
 ContentColourConversionDialog::check_for_preset ()
 {
@@ -91,7 +101,7 @@ ContentColourConversionDialog::check_for_preset ()
 		return;
 	}
 
-	optional<size_t> preset = _editor->get().preset ();
+	auto preset = _editor->get().preset ();
 
 	_preset_check->SetValue (static_cast<bool>(preset));
 	_preset_choice->Enable (static_cast<bool>(preset));
@@ -102,6 +112,7 @@ ContentColourConversionDialog::check_for_preset ()
 	}
 }
 
+
 void
 ContentColourConversionDialog::preset_check_clicked ()
 {
@@ -114,10 +125,11 @@ ContentColourConversionDialog::preset_check_clicked ()
 	}
 }
 
+
 void
 ContentColourConversionDialog::preset_choice_changed ()
 {
-	vector<PresetColourConversion> presets = PresetColourConversion::all ();
+	auto presets = PresetColourConversion::all ();
 	int const s = _preset_choice->GetCurrentSelection();
 	if (s != -1) {
 		set (presets[s].conversion);