X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_colour_conversion_dialog.cc;h=00700b72e75addf587376d381f3dd6656baa2881;hb=9ecbea39835a1e6cd8e01b585530741c0b3fb389;hp=54f56f432cb041ebeaa7d5a128afa5f22f66de18;hpb=b9a1ad3df5f9d85fb7439efd93fede72b9b078af;p=dcpomatic.git

diff --git a/src/wx/content_colour_conversion_dialog.cc b/src/wx/content_colour_conversion_dialog.cc
index 54f56f432..00700b72e 100644
--- a/src/wx/content_colour_conversion_dialog.cc
+++ b/src/wx/content_colour_conversion_dialog.cc
@@ -26,14 +26,12 @@
 #include "lib/colour_conversion.h"
 #include "lib/config.h"
 #include "lib/util.h"
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/statline.h>
-DCPOMATIC_ENABLE_WARNINGS
-#include <iostream>
+LIBDCP_ENABLE_WARNINGS
 
 
-using std::cout;
 using std::string;
 using std::vector;
 using boost::optional;
@@ -65,7 +63,7 @@ ContentColourConversionDialog::ContentColourConversionDialog (wxWindow* parent,
 	overall_sizer->Layout ();
 	overall_sizer->SetSizeHints (this);
 
-	_preset_check->Bind (wxEVT_CHECKBOX, boost::bind (&ContentColourConversionDialog::preset_check_clicked, this));
+	_preset_check->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));