X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fcontent_colour_conversion_dialog.cc;h=351d5aa65db086689df835820798eaf78941ee11;hp=995e80f6b6c705c0fee404103bd6792fd0164fec;hb=9001a63be211fd8e97431f8fc07c66af01554f5a;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05

diff --git a/src/wx/content_colour_conversion_dialog.cc b/src/wx/content_colour_conversion_dialog.cc
index 995e80f6b..351d5aa65 100644
--- a/src/wx/content_colour_conversion_dialog.cc
+++ b/src/wx/content_colour_conversion_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,12 +18,13 @@
 
 */
 
-#include "lib/colour_conversion.h"
-#include "lib/config.h"
-#include "lib/util.h"
 #include "wx_util.h"
+#include "check_box.h"
 #include "content_colour_conversion_dialog.h"
 #include "colour_conversion_editor.h"
+#include "lib/colour_conversion.h"
+#include "lib/config.h"
+#include "lib/util.h"
 #include <wx/statline.h>
 #include <boost/foreach.hpp>
 #include <iostream>
@@ -42,7 +43,7 @@ ContentColourConversionDialog::ContentColourConversionDialog (wxWindow* parent,
 	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"));
+	_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);
@@ -51,7 +52,7 @@ ContentColourConversionDialog::ContentColourConversionDialog (wxWindow* parent,
 	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());
 	}
@@ -59,8 +60,8 @@ 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));