Cleanup: use new CheckBox::bind().

51 files changed, 241 insertions, 218 deletions

diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index e433f45fd..4cd308ab1 100644
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -114,7 +114,7 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film, FilmViewer& v
 		_channel_checkbox[i] = new CheckBox (this, std_to_wx(audio_channel_name(i)));
 		_channel_checkbox[i]->SetForegroundColour(wxColour(_plot->colour(i)));
 		right->Add (_channel_checkbox[i], 0, wxEXPAND | wxALL, 3);
-		_channel_checkbox[i]->Bind (wxEVT_CHECKBOX, boost::bind (&AudioDialog::channel_clicked, this, _1));
+		_channel_checkbox[i]->bind(&AudioDialog::channel_clicked, this, _1);
 	}
 
 	show_or_hide_channel_checkboxes ();
@@ -133,7 +133,7 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film, FilmViewer& v
 	for (int i = 0; i < AudioPoint::COUNT; ++i) {
 		_type_checkbox[i] = new CheckBox (this, types[i]);
 		right->Add (_type_checkbox[i], 0, wxEXPAND | wxALL, 3);
-		_type_checkbox[i]->Bind (wxEVT_CHECKBOX, boost::bind (&AudioDialog::type_clicked, this, _1));
+		_type_checkbox[i]->bind(&AudioDialog::type_clicked, this, _1);
 	}
 
 	{
diff --git a/src/wx/audio_dialog.h b/src/wx/audio_dialog.h
index 71fbb658b..2767a7f59 100644
--- a/src/wx/audio_dialog.h
+++ b/src/wx/audio_dialog.h
@@ -30,6 +30,7 @@ LIBDCP_ENABLE_WARNINGS
 
 
 class AudioPlot;
+class CheckBox;
 class FilmViewer;
 class Film;
 
@@ -67,8 +68,8 @@ private:
 	wxStaticText* _integrated_loudness;
 	wxStaticText* _loudness_range;
 	wxStaticText* _leqm;
-	wxCheckBox* _channel_checkbox[MAX_DCP_AUDIO_CHANNELS];
-	wxCheckBox* _type_checkbox[AudioPoint::COUNT];
+	CheckBox* _channel_checkbox[MAX_DCP_AUDIO_CHANNELS];
+	CheckBox* _type_checkbox[AudioPoint::COUNT];
 	wxSlider* _smoothing;
 	boost::signals2::scoped_connection _film_connection;
 	boost::signals2::scoped_connection _film_content_connection;
diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc
index 5e8370d46..f84c9d67f 100644
--- a/src/wx/audio_panel.cc
+++ b/src/wx/audio_panel.cc
@@ -113,7 +113,7 @@ AudioPanel::create ()
 	_fade_out_label = create_label (this, _("Fade out"), true);
 	_fade_out = new Timecode<ContentTime> (this);
 
-	_use_same_fades_as_video = new wxCheckBox (this, wxID_ANY, _("Use same fades as video"));
+	_use_same_fades_as_video = new CheckBox(this, _("Use same fades as video"));
 
 	_mapping = new AudioMappingView (this, _("Content"), _("content"), _("DCP"), _("DCP"));
 	_sizer->Add (_mapping, 1, wxEXPAND | wxALL, 6);
@@ -132,13 +132,13 @@ AudioPanel::create ()
 	film_changed (Film::Property::VIDEO_FRAME_RATE);
 	film_changed (Film::Property::REEL_TYPE);
 
-	_reference->Bind             (wxEVT_CHECKBOX, boost::bind (&AudioPanel::reference_clicked, this));
+	_reference->bind(&AudioPanel::reference_clicked, this);
 	_show->Bind                  (wxEVT_BUTTON,   boost::bind (&AudioPanel::show_clicked, this));
 	_gain_calculate_button->Bind (wxEVT_BUTTON,   boost::bind (&AudioPanel::gain_calculate_button_clicked, this));
 
 	_fade_in->Changed.connect (boost::bind(&AudioPanel::fade_in_changed, this));
 	_fade_out->Changed.connect (boost::bind(&AudioPanel::fade_out_changed, this));
-	_use_same_fades_as_video->Bind (wxEVT_CHECKBOX, boost::bind(&AudioPanel::use_same_fades_as_video_changed, this));
+	_use_same_fades_as_video->bind(&AudioPanel::use_same_fades_as_video_changed, this);
 
 	_mapping_connection = _mapping->Changed.connect (boost::bind (&AudioPanel::mapping_changed, this, _1));
 	_active_jobs_connection = JobManager::instance()->ActiveJobsChanged.connect (boost::bind (&AudioPanel::active_jobs_changed, this, _1, _2));
diff --git a/src/wx/audio_panel.h b/src/wx/audio_panel.h
index e3a294955..bd6e0163d 100644
--- a/src/wx/audio_panel.h
+++ b/src/wx/audio_panel.h
@@ -19,19 +19,20 @@
 */
 
 
-#include "lib/audio_mapping.h"
 #include "content_sub_panel.h"
 #include "content_widget.h"
 #include "timecode.h"
+#include "lib/audio_mapping.h"
 
 
-class wxSpinCtrlDouble;
+class AudioDialog;
+class AudioMappingView;
+class CheckBox;
+class LanguageTagWidget;
 class wxButton;
 class wxChoice;
+class wxSpinCtrlDouble;
 class wxStaticText;
-class AudioMappingView;
-class AudioDialog;
-class LanguageTagWidget;
 
 
 class AudioPanel : public ContentSubPanel
@@ -61,7 +62,7 @@ private:
 	void fade_out_changed ();
 	void use_same_fades_as_video_changed ();
 
-	wxCheckBox* _reference;
+	CheckBox* _reference;
 	wxStaticText* _reference_note;
 	wxButton* _show;
 	wxStaticText* _gain_label;
@@ -76,7 +77,7 @@ private:
 	Timecode<dcpomatic::ContentTime>* _fade_in;
 	wxStaticText* _fade_out_label;
 	Timecode<dcpomatic::ContentTime>* _fade_out;
-	wxCheckBox* _use_same_fades_as_video;
+	CheckBox* _use_same_fades_as_video;
 	AudioMappingView* _mapping;
 	wxStaticText* _description;
 	AudioDialog* _audio_dialog = nullptr;
diff --git a/src/wx/colour_conversion_editor.cc b/src/wx/colour_conversion_editor.cc
index 4cc9aaa9e..686238c55 100644
--- a/src/wx/colour_conversion_editor.cc
+++ b/src/wx/colour_conversion_editor.cc
@@ -223,7 +223,7 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent, bool yuv)
 	_input_power->SetIncrement (0.1);
 
 	_input->Bind (wxEVT_CHOICE, bind (&ColourConversionEditor::changed, this));
-	_input_gamma->Bind (wxEVT_SPINCTRLDOUBLE, bind (&ColourConversionEditor::changed, this, _input_gamma));
+	_input_gamma->Bind(wxEVT_SPINCTRLDOUBLE, bind(&ColourConversionEditor::spin_ctrl_changed, this, _input_gamma));
 	_input_power->Bind (wxEVT_TEXT, bind (&ColourConversionEditor::changed, this));
 	_input_threshold->Bind (wxEVT_TEXT, bind (&ColourConversionEditor::changed, this));
 	_input_A->Bind (wxEVT_TEXT, bind (&ColourConversionEditor::changed, this));
@@ -236,11 +236,11 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent, bool yuv)
 	_blue_y->Bind (wxEVT_TEXT, bind (&ColourConversionEditor::chromaticity_changed, this));
 	_white_x->Bind (wxEVT_TEXT, bind (&ColourConversionEditor::chromaticity_changed, this));
 	_white_y->Bind (wxEVT_TEXT, bind (&ColourConversionEditor::chromaticity_changed, this));
-	_adjust_white->Bind (wxEVT_CHECKBOX, bind (&ColourConversionEditor::adjusted_white_changed, this));
+	_adjust_white->bind(&ColourConversionEditor::adjusted_white_changed, this);
 	_adjusted_white_x->Bind (wxEVT_TEXT, bind (&ColourConversionEditor::adjusted_white_changed, this));
 	_adjusted_white_y->Bind (wxEVT_TEXT, bind (&ColourConversionEditor::adjusted_white_changed, this));
 	_yuv_to_rgb->Bind (wxEVT_CHOICE, bind (&ColourConversionEditor::changed, this));
-	_output->Bind (wxEVT_CHECKBOX, bind (&ColourConversionEditor::changed, this));
+	_output->bind(&ColourConversionEditor::changed, this);
 }
 
 
@@ -449,7 +449,7 @@ ColourConversionEditor::update_rgb_to_xyz ()
 
 
 void
-ColourConversionEditor::changed (wxSpinCtrlDouble* sc)
+ColourConversionEditor::spin_ctrl_changed(wxSpinCtrlDouble* sc)
 {
 	/* On OS X, it seems that in some cases when a wxSpinCtrlDouble loses focus
 	   it emits an erroneous changed signal, which messes things up.
diff --git a/src/wx/colour_conversion_editor.h b/src/wx/colour_conversion_editor.h
index cc3c3d225..de5ffb794 100644
--- a/src/wx/colour_conversion_editor.h
+++ b/src/wx/colour_conversion_editor.h
@@ -47,7 +47,7 @@ public:
 
 private:
 	void changed ();
-	void changed (wxSpinCtrlDouble *);
+	void spin_ctrl_changed(wxSpinCtrlDouble *);
 	void chromaticity_changed ();
 	void adjusted_white_changed ();
 	void update_rgb_to_xyz ();
@@ -79,10 +79,10 @@ private:
 	wxTextCtrl* _blue_y;
 	wxTextCtrl* _white_x;
 	wxTextCtrl* _white_y;
-	wxCheckBox* _adjust_white;
+	CheckBox* _adjust_white;
 	wxTextCtrl* _adjusted_white_x;
 	wxTextCtrl* _adjusted_white_y;
-	wxCheckBox* _output;
+	CheckBox* _output;
 	wxStaticText* _rgb_to_xyz[3][3];
 	wxStaticText* _bradford[3][3];
 };
diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 07ab2d8aa..b23b4bae8 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -152,7 +152,7 @@ GeneralPage::add_language_controls (wxGridBagSizer* table, int& r)
 	restart->SetFont (font);
 	++r;
 
-	_set_language->Bind (wxEVT_CHECKBOX, bind (&GeneralPage::set_language_changed, this));
+	_set_language->bind(&GeneralPage::set_language_changed, this);
 	_language->Bind     (wxEVT_CHOICE,   bind (&GeneralPage::language_changed,     this));
 }
 
@@ -167,8 +167,8 @@ GeneralPage::add_update_controls (wxGridBagSizer* table, int& r)
 	table->Add (_check_for_test_updates, wxGBPosition (r, 0), wxGBSpan (1, 2));
 	++r;
 
-	_check_for_updates->Bind (wxEVT_CHECKBOX, bind (&GeneralPage::check_for_updates_changed, this));
-	_check_for_test_updates->Bind (wxEVT_CHECKBOX, bind (&GeneralPage::check_for_test_updates_changed, this));
+	_check_for_updates->bind(&GeneralPage::check_for_updates_changed, this);
+	_check_for_test_updates->bind(&GeneralPage::check_for_test_updates_changed, this);
 }
 
 void
@@ -895,7 +895,7 @@ SoundPage::setup ()
 		}
 	}
 
-	_sound->Bind        (wxEVT_CHECKBOX, bind(&SoundPage::sound_changed, this));
+	_sound->bind(&SoundPage::sound_changed, this);
 	_sound_output->Bind (wxEVT_CHOICE,   bind(&SoundPage::sound_output_changed, this));
 	_map->Changed.connect (bind(&SoundPage::map_changed, this, _1));
 	_reset_to_default->Bind (wxEVT_BUTTON,   bind(&SoundPage::reset_to_default, this));
diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h
index a258e1fe2..e0d7f15b8 100644
--- a/src/wx/config_dialog.h
+++ b/src/wx/config_dialog.h
@@ -49,6 +49,7 @@ LIBDCP_ENABLE_WARNINGS
 
 
 class AudioMappingView;
+class CheckBox;
 
 
 class Page : public wxPreferencesPage
@@ -104,10 +105,10 @@ private:
 	void check_for_updates_changed ();
 	void check_for_test_updates_changed ();
 
-	wxCheckBox* _set_language;
+	CheckBox* _set_language;
 	wxChoice* _language;
-	wxCheckBox* _check_for_updates;
-	wxCheckBox* _check_for_test_updates;
+	CheckBox* _check_for_updates;
+	CheckBox* _check_for_test_updates;
 };
 
 
@@ -212,7 +213,7 @@ private:
 	void map_changed (AudioMapping m);
 	void reset_to_default ();
 
-	wxCheckBox* _sound;
+	CheckBox* _sound;
 	wxChoice* _sound_output;
 	wxStaticText* _sound_output_details;
 	AudioMappingView* _map;
diff --git a/src/wx/confirm_kdm_email_dialog.cc b/src/wx/confirm_kdm_email_dialog.cc
index 7709442c9..665086557 100644
--- a/src/wx/confirm_kdm_email_dialog.cc
+++ b/src/wx/confirm_kdm_email_dialog.cc
@@ -40,10 +40,10 @@ ConfirmKDMEmailDialog::ConfirmKDMEmailDialog (wxWindow* parent, list<string> ema
 
 	_sizer->Add (new StaticText (this, message), 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
 
-	wxCheckBox* shut_up = new CheckBox (this, _("Don't ask this again"));
+	auto shut_up = new CheckBox (this, _("Don't ask this again"));
 	_sizer->Add (shut_up, 0, wxALL, DCPOMATIC_DIALOG_BORDER);
 
-	shut_up->Bind (wxEVT_CHECKBOX, bind (&ConfirmKDMEmailDialog::shut_up, this, _1));
+	shut_up->bind(&ConfirmKDMEmailDialog::shut_up, this, _1);
 
 	layout ();
 }
diff --git a/src/wx/content_advanced_dialog.cc b/src/wx/content_advanced_dialog.cc
index 547b77bb3..35343d78d 100644
--- a/src/wx/content_advanced_dialog.cc
+++ b/src/wx/content_advanced_dialog.cc
@@ -19,6 +19,7 @@
 */
 
 
+#include "check_box.h"
 #include "content_advanced_dialog.h"
 #include "dcpomatic_button.h"
 #include "filter_dialog.h"
@@ -94,13 +95,13 @@ ContentAdvancedDialog::ContentAdvancedDialog (wxWindow* parent, shared_ptr<Conte
 
 	/// TRANSLATORS: next to this control is a language selector, so together they will read, for example
 	/// "Video has burnt-in subtitles in the language fr-FR"
-	_burnt_subtitle = new wxCheckBox (this, wxID_ANY, _("Video has burnt-in subtitles in the language"));
+	_burnt_subtitle = new CheckBox(this, _("Video has burnt-in subtitles in the language"));
 	sizer->Add (_burnt_subtitle, wxGBPosition(r, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
 	_burnt_subtitle_language = new LanguageTagWidget (this, _("Language of burnt-in subtitles in this content"), content->video ? content->video->burnt_subtitle_language() : boost::none);
 	sizer->Add (_burnt_subtitle_language->sizer(), wxGBPosition(r, 1), wxGBSpan(1, 2), wxEXPAND);
 	++r;
 
-	_ignore_video = new wxCheckBox (this, wxID_ANY, _("Ignore this content's video and use only audio, subtitles and closed captions"));
+	_ignore_video = new CheckBox(this, _("Ignore this content's video and use only audio, subtitles and closed captions"));
 	sizer->Add(_ignore_video, wxGBPosition(r, 0), wxGBSpan(1, 3));
 	++r;
 
@@ -138,7 +139,7 @@ ContentAdvancedDialog::ContentAdvancedDialog (wxWindow* parent, shared_ptr<Conte
 	_filters_button->Bind (wxEVT_BUTTON, bind(&ContentAdvancedDialog::edit_filters, this));
 	_set_video_frame_rate->Bind (wxEVT_BUTTON, bind(&ContentAdvancedDialog::set_video_frame_rate, this));
 	_video_frame_rate->Bind (wxEVT_TEXT, boost::bind(&ContentAdvancedDialog::video_frame_rate_changed, this));
-	_burnt_subtitle->Bind (wxEVT_CHECKBOX, boost::bind(&ContentAdvancedDialog::burnt_subtitle_changed, this));
+	_burnt_subtitle->bind(&ContentAdvancedDialog::burnt_subtitle_changed, this);
 
 	setup_sensitivity ();
 }
diff --git a/src/wx/content_advanced_dialog.h b/src/wx/content_advanced_dialog.h
index 93a90ba61..517ad04e5 100644
--- a/src/wx/content_advanced_dialog.h
+++ b/src/wx/content_advanced_dialog.h
@@ -29,6 +29,7 @@ LIBDCP_ENABLE_WARNINGS
 #include <vector>
 
 
+class CheckBox;
 class Content;
 class Filter;
 class LanguageTagWidget;
@@ -65,8 +66,8 @@ private:
 	wxButton* _filters_button;
 	wxTextCtrl* _video_frame_rate;
 	wxButton* _set_video_frame_rate;
-	wxCheckBox* _burnt_subtitle;
+	CheckBox* _burnt_subtitle;
 	LanguageTagWidget* _burnt_subtitle_language;
-	wxCheckBox* _ignore_video;
+	CheckBox* _ignore_video;
 };
 
diff --git a/src/wx/content_colour_conversion_dialog.cc b/src/wx/content_colour_conversion_dialog.cc
index 5b5a1983c..00700b72e 100644
--- a/src/wx/content_colour_conversion_dialog.cc
+++ b/src/wx/content_colour_conversion_dialog.cc
@@ -63,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));
diff --git a/src/wx/content_colour_conversion_dialog.h b/src/wx/content_colour_conversion_dialog.h
index e42961019..84fb47e5a 100644
--- a/src/wx/content_colour_conversion_dialog.h
+++ b/src/wx/content_colour_conversion_dialog.h
@@ -43,7 +43,7 @@ private:
 	void preset_check_clicked ();
 	void preset_choice_changed ();
 
-	wxCheckBox* _preset_check;
+	CheckBox* _preset_check;
 	wxChoice* _preset_choice;
 	ColourConversionEditor* _editor;
 	bool _setting;
diff --git a/src/wx/controls.cc b/src/wx/controls.cc
index 61c671788..f16b494c9 100644
--- a/src/wx/controls.cc
+++ b/src/wx/controls.cc
@@ -137,7 +137,7 @@ Controls::Controls(wxWindow* parent, FilmViewer& viewer, bool editor_controls)
 		_eye->Bind (wxEVT_CHOICE, boost::bind (&Controls::eye_changed, this));
 	}
 	if (_outline_content) {
-		_outline_content->Bind (wxEVT_CHECKBOX, boost::bind (&Controls::outline_content_changed, this));
+		_outline_content->bind(&Controls::outline_content_changed, this);
 	}
 
 	_slider->Bind           (wxEVT_SCROLL_THUMBTRACK,    boost::bind(&Controls::slider_moved,    this, false));
@@ -150,7 +150,7 @@ Controls::Controls(wxWindow* parent, FilmViewer& viewer, bool editor_controls)
 	_frame_number->Bind     (wxEVT_LEFT_DOWN,            boost::bind(&Controls::frame_number_clicked, this));
 	_timecode->Bind         (wxEVT_LEFT_DOWN,            boost::bind(&Controls::timecode_clicked, this));
 	if (_jump_to_selected) {
-		_jump_to_selected->Bind (wxEVT_CHECKBOX, boost::bind (&Controls::jump_to_selected_clicked, this));
+		_jump_to_selected->bind(&Controls::jump_to_selected_clicked, this);
 		_jump_to_selected->SetValue (Config::instance()->jump_to_selected ());
 	}
 
diff --git a/src/wx/controls.h b/src/wx/controls.h
index a7e32179c..df33005ff 100644
--- a/src/wx/controls.h
+++ b/src/wx/controls.h
@@ -33,6 +33,7 @@ LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 
+class CheckBox;
 class ClosedCaptionsDialog;
 class Content;
 class ContentView;
@@ -108,9 +109,9 @@ private:
 
 	bool _slider_being_moved;
 
-	wxCheckBox* _outline_content;
+	CheckBox* _outline_content;
 	wxChoice* _eye;
-	wxCheckBox* _jump_to_selected;
+	CheckBox* _jump_to_selected;
 	wxButton* _rewind_button;
 	wxButton* _back_button;
 	wxButton* _forward_button;
diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc
index 1457c06a6..d8aa3ac46 100644
--- a/src/wx/dcp_panel.cc
+++ b/src/wx/dcp_panel.cc
@@ -97,7 +97,7 @@ DCPPanel::DCPPanel(wxNotebook* n, shared_ptr<Film> film, FilmViewer& viewer)
 		wxALIGN_CENTRE_HORIZONTAL | wxST_NO_AUTORESIZE | wxST_ELLIPSIZE_MIDDLE
 		);
 
-	_enable_audio_language = new wxCheckBox (_panel, wxID_ANY, _("Audio language"));
+	_enable_audio_language = new CheckBox(_panel, _("Audio language"));
 	_audio_language = new wxStaticText (_panel, wxID_ANY, wxT(""));
 	_edit_audio_language = new Button (_panel, _("Edit..."));
 
@@ -130,16 +130,16 @@ DCPPanel::DCPPanel(wxNotebook* n, shared_ptr<Film> film, FilmViewer& viewer)
 	_notebook->AddPage (make_audio_panel (), _("Audio"), false);
 
 	_name->Bind		     (wxEVT_TEXT,     boost::bind(&DCPPanel::name_changed, this));
-	_use_isdcf_name->Bind	     (wxEVT_CHECKBOX, boost::bind(&DCPPanel::use_isdcf_name_toggled, this));
+	_use_isdcf_name->bind(&DCPPanel::use_isdcf_name_toggled, this);
 	_copy_isdcf_name_button->Bind(wxEVT_BUTTON,   boost::bind(&DCPPanel::copy_isdcf_name_button_clicked, this));
 	_dcp_content_type->Bind	     (wxEVT_CHOICE,   boost::bind(&DCPPanel::dcp_content_type_changed, this));
-	_encrypted->Bind             (wxEVT_CHECKBOX, boost::bind(&DCPPanel::encrypted_toggled, this));
+	_encrypted->bind(&DCPPanel::encrypted_toggled, this);
 	_reel_type->Bind             (wxEVT_CHOICE,   boost::bind(&DCPPanel::reel_type_changed, this));
 	_reel_length->Bind           (wxEVT_SPINCTRL, boost::bind(&DCPPanel::reel_length_changed, this));
 	_standard->Bind              (wxEVT_CHOICE,   boost::bind(&DCPPanel::standard_changed, this));
 	_markers->Bind               (wxEVT_BUTTON,   boost::bind(&DCPPanel::markers_clicked, this));
 	_metadata->Bind              (wxEVT_BUTTON,   boost::bind(&DCPPanel::metadata_clicked, this));
-	_enable_audio_language->Bind (wxEVT_CHECKBOX, boost::bind(&DCPPanel::enable_audio_language_toggled, this));
+	_enable_audio_language->bind(&DCPPanel::enable_audio_language_toggled, this);
 	_edit_audio_language->Bind   (wxEVT_BUTTON,   boost::bind(&DCPPanel::edit_audio_language_clicked, this));
 
 	for (auto i: DCPContentType::all()) {
@@ -806,8 +806,8 @@ DCPPanel::make_video_panel ()
 	/* Also listen to wxEVT_TEXT so that typing numbers directly in is always noticed */
 	_j2k_bandwidth->Bind	 (wxEVT_TEXT,     boost::bind(&DCPPanel::j2k_bandwidth_changed, this));
 	_resolution->Bind        (wxEVT_CHOICE,   boost::bind(&DCPPanel::resolution_changed, this));
-	_three_d->Bind	 	 (wxEVT_CHECKBOX, boost::bind(&DCPPanel::three_d_changed, this));
-	_reencode_j2k->Bind      (wxEVT_CHECKBOX, boost::bind(&DCPPanel::reencode_j2k_changed, this));
+	_three_d->bind(&DCPPanel::three_d_changed, this);
+	_reencode_j2k->bind(&DCPPanel::reencode_j2k_changed, this);
 
 	for (auto i: Ratio::containers()) {
 		_container->add(i->container_nickname());
diff --git a/src/wx/dcp_panel.h b/src/wx/dcp_panel.h
index 31d58e1f8..7d7f0bd79 100644
--- a/src/wx/dcp_panel.h
+++ b/src/wx/dcp_panel.h
@@ -24,12 +24,12 @@
 
 
 class Button;
+class CheckBox;
 class wxNotebook;
 class wxPanel;
 class wxBoxSizer;
 class wxTextCtrl;
 class wxStaticText;
-class wxCheckBox;
 class wxChoice;
 class wxButton;
 class wxSpinCtrl;
@@ -118,8 +118,8 @@ private:
 	wxStaticText* _name_label;
 	wxTextCtrl* _name;
 	wxStaticText* _dcp_name;
-	wxCheckBox* _use_isdcf_name;
-	wxCheckBox* _enable_audio_language = nullptr;
+	CheckBox* _use_isdcf_name;
+	CheckBox* _enable_audio_language = nullptr;
 	wxStaticText* _audio_language = nullptr;
 	Button* _edit_audio_language = nullptr;
 	wxStaticText* _container_label;
@@ -143,13 +143,13 @@ private:
 	Choice* _audio_processor;
 	wxButton* _show_audio;
 	wxButton* _best_frame_rate;
-	wxCheckBox* _three_d;
-	wxCheckBox* _reencode_j2k;
+	CheckBox* _three_d;
+	CheckBox* _reencode_j2k;
 	wxStaticText* _resolution_label;
 	Choice* _resolution;
 	wxStaticText* _standard_label;
 	Choice* _standard;
-	wxCheckBox* _encrypted;
+	CheckBox* _encrypted;
 	wxStaticText* _reels_label;
 	Choice* _reel_type;
 	wxStaticText* _reel_length_label;
diff --git a/src/wx/dkdm_output_panel.cc b/src/wx/dkdm_output_panel.cc
index 9eb3084e3..952a7d904 100644
--- a/src/wx/dkdm_output_panel.cc
+++ b/src/wx/dkdm_output_panel.cc
@@ -94,8 +94,8 @@ DKDMOutputPanel::DKDMOutputPanel (wxWindow* parent)
 	table->Add (_email, 1, wxEXPAND);
 	table->AddSpacer (0);
 
-	_write_to->Bind (wxEVT_CHECKBOX, boost::bind(&DKDMOutputPanel::setup_sensitivity, this));
-	_email->Bind (wxEVT_CHECKBOX, boost::bind(&DKDMOutputPanel::setup_sensitivity, this));
+	_write_to->bind(&DKDMOutputPanel::setup_sensitivity, this);
+	_email->bind(&DKDMOutputPanel::setup_sensitivity, this);
 
 	SetSizer (table);
 }
diff --git a/src/wx/dkdm_output_panel.h b/src/wx/dkdm_output_panel.h
index 297c31887..9bdbd5672 100644
--- a/src/wx/dkdm_output_panel.h
+++ b/src/wx/dkdm_output_panel.h
@@ -30,6 +30,7 @@ LIBDCP_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 
 
+class CheckBox;
 class DirPickerCtrl;
 class Job;
 class KDMTimingPanel;
@@ -55,11 +56,11 @@ public:
 
 private:
 	NameFormatEditor* _filename_format;
-	wxCheckBox* _write_to;
+	CheckBox* _write_to;
 #ifdef DCPOMATIC_USE_OWN_PICKER
 	DirPickerCtrl* _folder;
 #else
 	wxDirPickerCtrl* _folder;
 #endif
-	wxCheckBox* _email;
+	CheckBox* _email;
 };
diff --git a/src/wx/export_subtitles_dialog.cc b/src/wx/export_subtitles_dialog.cc
index cb9629a18..3c32fae53 100644
--- a/src/wx/export_subtitles_dialog.cc
+++ b/src/wx/export_subtitles_dialog.cc
@@ -65,8 +65,8 @@ ExportSubtitlesDialog::ExportSubtitlesDialog (wxWindow* parent, int reels, bool
 	_dir = new DirPickerCtrl (this);
 	add (_dir);
 
-	_split_reels->Bind (wxEVT_CHECKBOX, bind(&ExportSubtitlesDialog::setup_sensitivity, this));
-	_include_font->Bind (wxEVT_CHECKBOX, bind(&ExportSubtitlesDialog::setup_sensitivity, this));
+	_split_reels->bind(&ExportSubtitlesDialog::setup_sensitivity, this);
+	_include_font->bind(&ExportSubtitlesDialog::setup_sensitivity, this);
 	_file->Bind (wxEVT_FILEPICKER_CHANGED, bind(&ExportSubtitlesDialog::setup_sensitivity, this));
 	_dir->Bind (wxEVT_DIRPICKER_CHANGED, bind(&ExportSubtitlesDialog::setup_sensitivity, this));
 
diff --git a/src/wx/export_subtitles_dialog.h b/src/wx/export_subtitles_dialog.h
index db614f667..0a3177cac 100644
--- a/src/wx/export_subtitles_dialog.h
+++ b/src/wx/export_subtitles_dialog.h
@@ -28,6 +28,7 @@ LIBDCP_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 
 
+class CheckBox;
 class FilePickerCtrl;
 
 
@@ -44,8 +45,8 @@ private:
 	void setup_sensitivity ();
 
 	bool _interop;
-	wxCheckBox* _split_reels;
-	wxCheckBox* _include_font;
+	CheckBox* _split_reels;
+	CheckBox* _include_font;
 	wxStaticText* _file_label;
 	FilePickerCtrl* _file;
 	DirPickerCtrl* _dir;
diff --git a/src/wx/export_video_file_dialog.cc b/src/wx/export_video_file_dialog.cc
index ec54cc408..208481225 100644
--- a/src/wx/export_video_file_dialog.cc
+++ b/src/wx/export_video_file_dialog.cc
@@ -118,9 +118,9 @@ ExportVideoFileDialog::ExportVideoFileDialog (wxWindow* parent, string name)
 		_x264_crf_label[i]->Enable (false);
 	}
 
-	_mixdown->Bind (wxEVT_CHECKBOX, bind(&ExportVideoFileDialog::mixdown_changed, this));
-	_split_reels->Bind (wxEVT_CHECKBOX, bind(&ExportVideoFileDialog::split_reels_changed, this));
-	_split_streams->Bind (wxEVT_CHECKBOX, bind(&ExportVideoFileDialog::split_streams_changed, this));
+	_mixdown->bind(&ExportVideoFileDialog::mixdown_changed, this);
+	_split_reels->bind(&ExportVideoFileDialog::split_reels_changed, this);
+	_split_streams->bind(&ExportVideoFileDialog::split_streams_changed, this);
 	_x264_crf->Bind (wxEVT_SLIDER, bind(&ExportVideoFileDialog::x264_crf_changed, this));
 	_format->Bind (wxEVT_CHOICE, bind (&ExportVideoFileDialog::format_changed, this));
 	_file->Bind (wxEVT_FILEPICKER_CHANGED, bind (&ExportVideoFileDialog::file_changed, this));
diff --git a/src/wx/export_video_file_dialog.h b/src/wx/export_video_file_dialog.h
index 0b60166c4..beb33610b 100644
--- a/src/wx/export_video_file_dialog.h
+++ b/src/wx/export_video_file_dialog.h
@@ -53,9 +53,9 @@ private:
 
 	std::string _initial_name;
 	wxChoice* _format;
-	wxCheckBox* _mixdown;
-	wxCheckBox* _split_reels;
-	wxCheckBox* _split_streams;
+	CheckBox* _mixdown;
+	CheckBox* _split_reels;
+	CheckBox* _split_streams;
 	wxSlider* _x264_crf;
 	wxStaticText* _x264_crf_label[2];
 	FilePickerCtrl* _file;
diff --git a/src/wx/film_name_location_dialog.cc b/src/wx/film_name_location_dialog.cc
index 2f3fefe49..5c6f97f99 100644
--- a/src/wx/film_name_location_dialog.cc
+++ b/src/wx/film_name_location_dialog.cc
@@ -78,7 +78,7 @@ FilmNameLocationDialog::FilmNameLocationDialog (wxWindow* parent, wxString title
 			_template_name->Append (std_to_wx(i));
 		}
 
-		_use_template->Bind (wxEVT_CHECKBOX, bind(&FilmNameLocationDialog::use_template_clicked, this));
+		_use_template->bind(&FilmNameLocationDialog::use_template_clicked, this);
 	}
 
 	layout ();
diff --git a/src/wx/film_name_location_dialog.h b/src/wx/film_name_location_dialog.h
index a659ab22f..083d07cd4 100644
--- a/src/wx/film_name_location_dialog.h
+++ b/src/wx/film_name_location_dialog.h
@@ -28,6 +28,7 @@ LIBDCP_DISABLE_WARNINGS
 LIBDCP_ENABLE_WARNINGS
 
 
+class CheckBox;
 class DirPickerCtrl;
 
 
@@ -51,7 +52,7 @@ private:
 #else
 	wxDirPickerCtrl* _folder;
 #endif
-	wxCheckBox* _use_template;
+	CheckBox* _use_template;
 	wxChoice* _template_name;
 	static boost::optional<boost::filesystem::path> _directory;
 };
diff --git a/src/wx/filter_dialog.cc b/src/wx/filter_dialog.cc
index c4317bac1..f9ba06eae 100644
--- a/src/wx/filter_dialog.cc
+++ b/src/wx/filter_dialog.cc
@@ -67,7 +67,7 @@ FilterDialog::FilterDialog (wxWindow* parent, vector<Filter const *> const & act
 			bool const a = find (active.begin(), active.end(), j) != active.end();
 			b->SetValue (a);
 			_filters[j] = b;
-			b->Bind (wxEVT_CHECKBOX, boost::bind(&FilterDialog::filter_toggled, this));
+			b->bind(&FilterDialog::filter_toggled, this);
 			sizer->Add (b);
 		}
 
diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc
index 1eb87d93e..c688109c9 100644
--- a/src/wx/full_config_dialog.cc
+++ b/src/wx/full_config_dialog.cc
@@ -144,9 +144,9 @@ private:
 		export_cinemas->Bind (wxEVT_BUTTON, boost::bind (&FullGeneralPage::export_cinemas_file, this));
 
 #ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
-		_analyse_ebur128->Bind (wxEVT_CHECKBOX, boost::bind (&FullGeneralPage::analyse_ebur128_changed, this));
+		_analyse_ebur128->bind(&FullGeneralPage::analyse_ebur128_changed, this);
 #endif
-		_automatic_audio_analysis->Bind (wxEVT_CHECKBOX, boost::bind (&FullGeneralPage::automatic_audio_analysis_changed, this));
+		_automatic_audio_analysis->bind(&FullGeneralPage::automatic_audio_analysis_changed, this);
 	}
 
 	void config_changed () override
@@ -236,9 +236,9 @@ private:
 	FilePickerCtrl* _config_file;
 	FilePickerCtrl* _cinemas_file;
 #ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
-	wxCheckBox* _analyse_ebur128;
+	CheckBox* _analyse_ebur128;
 #endif
-	wxCheckBox* _automatic_audio_analysis;
+	CheckBox* _automatic_audio_analysis;
 };
 
 
@@ -367,7 +367,7 @@ private:
 		_kdm_duration->Bind (wxEVT_SPINCTRL, boost::bind(&DefaultsPage::kdm_duration_changed, this));
 		_kdm_duration_unit->Bind (wxEVT_CHOICE, boost::bind(&DefaultsPage::kdm_duration_changed, this));
 
-		_use_isdcf_name_by_default->Bind (wxEVT_CHECKBOX, boost::bind(&DefaultsPage::use_isdcf_name_by_default_changed, this));
+		_use_isdcf_name_by_default->bind(&DefaultsPage::use_isdcf_name_by_default_changed, this);
 
 		for (auto i: Ratio::containers()) {
 			_container->Append (std_to_wx(i->container_nickname()));
@@ -395,7 +395,7 @@ private:
 		_standard->Bind (wxEVT_CHOICE, boost::bind (&DefaultsPage::standard_changed, this));
 
 		for (auto const& i: _enable_metadata) {
-			i.second->Bind (wxEVT_CHECKBOX, boost::bind(&DefaultsPage::metadata_changed, this));
+			i.second->bind(&DefaultsPage::metadata_changed, this);
 		}
 
 		for (auto const& i: _metadata) {
@@ -590,7 +590,7 @@ private:
 	KDMChoice* _kdm_type;
 	wxSpinCtrl* _kdm_duration;
 	wxChoice* _kdm_duration_unit;
-	wxCheckBox* _use_isdcf_name_by_default;
+	CheckBox* _use_isdcf_name_by_default;
 	wxChoice* _container;
 	wxChoice* _dcp_content_type;
 	wxChoice* _dcp_audio_channels;
@@ -639,7 +639,7 @@ private:
 
 		_panel->GetSizer()->Add (_servers_list, 1, wxEXPAND | wxALL, _border);
 
-		_use_any_servers->Bind (wxEVT_CHECKBOX, boost::bind(&EncodingServersPage::use_any_servers_changed, this));
+		_use_any_servers->bind(&EncodingServersPage::use_any_servers_changed, this);
 	}
 
 	void config_changed () override
@@ -658,7 +658,7 @@ private:
 		return s;
 	}
 
-	wxCheckBox* _use_any_servers;
+	CheckBox* _use_any_servers;
 	EditableList<string, ServerDialog>* _servers_list;
 };
 
@@ -719,7 +719,7 @@ private:
 		_tms_protocol->Append (_("SCP (for AAM and Doremi)"));
 		_tms_protocol->Append (_("FTP (for Dolby)"));
 
-		_upload->Bind (wxEVT_CHECKBOX, boost::bind(&TMSPage::upload_changed, this));
+		_upload->bind(&TMSPage::upload_changed, this);
 		_tms_protocol->Bind (wxEVT_CHOICE, boost::bind (&TMSPage::tms_protocol_changed, this));
 		_tms_passive->bind(&TMSPage::tms_passive_changed, this);
 
@@ -1160,8 +1160,8 @@ private:
 
 		_cc->layout ();
 
-		_enable_message_box->Bind (wxEVT_CHECKBOX, boost::bind (&NotificationsPage::type_changed, this, _enable_message_box, Config::MESSAGE_BOX));
-		_enable_email->Bind (wxEVT_CHECKBOX, boost::bind (&NotificationsPage::type_changed, this, _enable_email, Config::EMAIL));
+		_enable_message_box->bind(&NotificationsPage::type_changed, this, _enable_message_box, Config::MESSAGE_BOX);
+		_enable_email->bind(&NotificationsPage::type_changed, this, _enable_email, Config::EMAIL);
 
 		_subject->Bind (wxEVT_TEXT, boost::bind (&NotificationsPage::notification_subject_changed, this));
 		_from->Bind (wxEVT_TEXT, boost::bind (&NotificationsPage::notification_from_changed, this));
@@ -1237,14 +1237,14 @@ private:
 		checked_set (_email, Config::instance()->notification_email());
 	}
 
-	void type_changed (wxCheckBox* b, Config::Notification n)
+	void type_changed (CheckBox* b, Config::Notification n)
 	{
 		Config::instance()->set_notification(n, b->GetValue());
 		setup_sensitivity ();
 	}
 
-	wxCheckBox* _enable_message_box;
-	wxCheckBox* _enable_email;
+	CheckBox* _enable_message_box;
+	CheckBox* _enable_email;
 
 	wxTextCtrl* _subject;
 	wxTextCtrl* _from;
@@ -1614,27 +1614,27 @@ private:
 		_video_display_mode->Append (_("OpenGL (faster)"));
 #endif
 		_video_display_mode->Bind (wxEVT_CHOICE, boost::bind(&AdvancedPage::video_display_mode_changed, this));
-		_allow_any_dcp_frame_rate->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::allow_any_dcp_frame_rate_changed, this));
-		_allow_any_container->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::allow_any_container_changed, this));
-		_allow_96khz_audio->Bind (wxEVT_CHECKBOX, boost::bind(&AdvancedPage::allow_96khz_audio_changed, this));
-		_use_all_audio_channels->Bind(wxEVT_CHECKBOX, boost::bind(&AdvancedPage::use_all_channels_changed, this));
-		_show_experimental_audio_processors->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::show_experimental_audio_processors_changed, this));
-		_only_servers_encode->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::only_servers_encode_changed, this));
+		_allow_any_dcp_frame_rate->bind(&AdvancedPage::allow_any_dcp_frame_rate_changed, this);
+		_allow_any_container->bind(&AdvancedPage::allow_any_container_changed, this);
+		_allow_96khz_audio->bind(&AdvancedPage::allow_96khz_audio_changed, this);
+		_use_all_audio_channels->bind(&AdvancedPage::use_all_channels_changed, this);
+		_show_experimental_audio_processors->bind(&AdvancedPage::show_experimental_audio_processors_changed, this);
+		_only_servers_encode->bind(&AdvancedPage::only_servers_encode_changed, this);
 		_frames_in_memory_multiplier->Bind (wxEVT_SPINCTRL, boost::bind(&AdvancedPage::frames_in_memory_multiplier_changed, this));
 		_dcp_metadata_filename_format->Changed.connect (boost::bind (&AdvancedPage::dcp_metadata_filename_format_changed, this));
 		_dcp_asset_filename_format->Changed.connect (boost::bind (&AdvancedPage::dcp_asset_filename_format_changed, this));
-		_log_general->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this));
-		_log_warning->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this));
-		_log_error->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this));
-		_log_timing->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this));
-		_log_debug_threed->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this));
-		_log_debug_encode->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this));
-		_log_debug_email->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this));
-		_log_debug_video_view->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this));
-		_log_debug_player->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this));
-		_log_debug_audio_analysis->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this));
+		_log_general->bind(&AdvancedPage::log_changed, this);
+		_log_warning->bind(&AdvancedPage::log_changed, this);
+		_log_error->bind(&AdvancedPage::log_changed, this);
+		_log_timing->bind(&AdvancedPage::log_changed, this);
+		_log_debug_threed->bind(&AdvancedPage::log_changed, this);
+		_log_debug_encode->bind(&AdvancedPage::log_changed, this);
+		_log_debug_email->bind(&AdvancedPage::log_changed, this);
+		_log_debug_video_view->bind(&AdvancedPage::log_changed, this);
+		_log_debug_player->bind(&AdvancedPage::log_changed, this);
+		_log_debug_audio_analysis->bind(&AdvancedPage::log_changed, this);
 #ifdef DCPOMATIC_WINDOWS
-		_win32_console->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::win32_console_changed, this));
+		_win32_console->bind(&AdvancedPage::win32_console_changed, this);
 #endif
 	}
 
@@ -1778,26 +1778,26 @@ private:
 	wxSpinCtrl* _maximum_j2k_bandwidth = nullptr;
 	wxChoice* _video_display_mode = nullptr;
 	wxSpinCtrl* _frames_in_memory_multiplier = nullptr;
-	wxCheckBox* _allow_any_dcp_frame_rate = nullptr;
-	wxCheckBox* _allow_any_container = nullptr;
-	wxCheckBox* _allow_96khz_audio = nullptr;
-	wxCheckBox* _use_all_audio_channels = nullptr;
-	wxCheckBox* _show_experimental_audio_processors = nullptr;
-	wxCheckBox* _only_servers_encode = nullptr;
+	CheckBox* _allow_any_dcp_frame_rate = nullptr;
+	CheckBox* _allow_any_container = nullptr;
+	CheckBox* _allow_96khz_audio = nullptr;
+	CheckBox* _use_all_audio_channels = nullptr;
+	CheckBox* _show_experimental_audio_processors = nullptr;
+	CheckBox* _only_servers_encode = nullptr;
 	NameFormatEditor* _dcp_metadata_filename_format = nullptr;
 	NameFormatEditor* _dcp_asset_filename_format = nullptr;
-	wxCheckBox* _log_general = nullptr;
-	wxCheckBox* _log_warning = nullptr;
-	wxCheckBox* _log_error = nullptr;
-	wxCheckBox* _log_timing = nullptr;
-	wxCheckBox* _log_debug_threed = nullptr;
-	wxCheckBox* _log_debug_encode = nullptr;
-	wxCheckBox* _log_debug_email = nullptr;
-	wxCheckBox* _log_debug_video_view = nullptr;
-	wxCheckBox* _log_debug_player = nullptr;
-	wxCheckBox* _log_debug_audio_analysis = nullptr;
+	CheckBox* _log_general = nullptr;
+	CheckBox* _log_warning = nullptr;
+	CheckBox* _log_error = nullptr;
+	CheckBox* _log_timing = nullptr;
+	CheckBox* _log_debug_threed = nullptr;
+	CheckBox* _log_debug_encode = nullptr;
+	CheckBox* _log_debug_email = nullptr;
+	CheckBox* _log_debug_video_view = nullptr;
+	CheckBox* _log_debug_player = nullptr;
+	CheckBox* _log_debug_audio_analysis = nullptr;
 #ifdef DCPOMATIC_WINDOWS
-	wxCheckBox* _win32_console = nullptr;
+	CheckBox* _win32_console = nullptr;
 #endif
 };
 
diff --git a/src/wx/hints_dialog.cc b/src/wx/hints_dialog.cc
index 05baf19ff..7a44e2267 100644
--- a/src/wx/hints_dialog.cc
+++ b/src/wx/hints_dialog.cc
@@ -62,9 +62,9 @@ HintsDialog::HintsDialog (wxWindow* parent, std::weak_ptr<Film> film, bool ok)
 	sizer->Add (_text, 1, wxEXPAND | wxALL, 6);
 
 	if (!ok) {
-		wxCheckBox* b = new CheckBox (this, _("Don't show hints again"));
+		auto b = new CheckBox(this, _("Don't show hints again"));
 		sizer->Add (b, 0, wxALL, 6);
-		b->Bind (wxEVT_CHECKBOX, bind (&HintsDialog::shut_up, this, _1));
+		b->bind(&HintsDialog::shut_up, this, _1);
 	}
 
 	auto buttons = CreateStdDialogButtonSizer (0);
diff --git a/src/wx/job_view.cc b/src/wx/job_view.cc
index 5a6484f0a..8dbe87652 100644
--- a/src/wx/job_view.cc
+++ b/src/wx/job_view.cc
@@ -87,7 +87,7 @@ JobView::setup ()
 	_controls = new wxBoxSizer (wxVERTICAL);
 	_controls->Add (_buttons);
 	_notify = new CheckBox (_container, _("Notify when complete"));
-	_notify->Bind (wxEVT_CHECKBOX, bind (&JobView::notify_clicked, this));
+	_notify->bind(&JobView::notify_clicked, this);
 	_notify->SetValue (Config::instance()->default_notify());
 	_controls->Add (_notify, 0, wxTOP, DCPOMATIC_BUTTON_STACK_GAP);
 
diff --git a/src/wx/job_view.h b/src/wx/job_view.h
index e6084b381..74518c9ba 100644
--- a/src/wx/job_view.h
+++ b/src/wx/job_view.h
@@ -18,22 +18,26 @@
 
 */
 
+
 #ifndef DCPOMATIC_JOB_VIEW_H
 #define DCPOMATIC_JOB_VIEW_H
 
+
 #include <boost/signals2.hpp>
 
+
+class CheckBox;
 class Job;
-class wxScrolledWindow;
-class wxWindow;
-class wxFlexGridSizer;
-class wxCommandEvent;
 class wxBoxSizer;
-class wxGauge;
-class wxStaticText;
 class wxButton;
+class wxCommandEvent;
+class wxFlexGridSizer;
+class wxGauge;
+class wxScrolledWindow;
 class wxSizer;
-class wxCheckBox;
+class wxStaticText;
+class wxWindow;
+
 
 class JobView
 {
@@ -81,7 +85,7 @@ private:
 	wxStaticText* _message;
 	wxButton* _cancel;
 	wxButton* _details;
-	wxCheckBox* _notify;
+	CheckBox* _notify;
 	/** sizer for all right-hand-size controls */
 	wxBoxSizer* _controls;
 	std::string _last_message;
@@ -90,4 +94,5 @@ private:
 	boost::signals2::scoped_connection _finished_connection;
 };
 
+
 #endif
diff --git a/src/wx/kdm_advanced_dialog.cc b/src/wx/kdm_advanced_dialog.cc
index c3ec8a6f3..bcdc26824 100644
--- a/src/wx/kdm_advanced_dialog.cc
+++ b/src/wx/kdm_advanced_dialog.cc
@@ -63,7 +63,7 @@ KDMAdvancedDialog::KDMAdvancedDialog (wxWindow* parent, bool forensic_mark_video
 	setup_sensitivity ();
 
 	_forensic_mark_audio_up_to->SetRange (1, 15);
-	_forensic_mark_audio->Bind (wxEVT_CHECKBOX, boost::bind(&KDMAdvancedDialog::setup_sensitivity, this));
+	_forensic_mark_audio->bind(&KDMAdvancedDialog::setup_sensitivity, this);
 	_forensic_mark_all_audio->Bind (wxEVT_RADIOBUTTON, boost::bind(&KDMAdvancedDialog::setup_sensitivity, this));
 	_forensic_mark_some_audio->Bind (wxEVT_RADIOBUTTON, boost::bind(&KDMAdvancedDialog::setup_sensitivity, this));
 }
diff --git a/src/wx/kdm_advanced_dialog.h b/src/wx/kdm_advanced_dialog.h
index 25e47d05c..34255bf88 100644
--- a/src/wx/kdm_advanced_dialog.h
+++ b/src/wx/kdm_advanced_dialog.h
@@ -35,8 +35,8 @@ public:
 private:
 	void setup_sensitivity ();
 
-	wxCheckBox* _forensic_mark_video;
-	wxCheckBox* _forensic_mark_audio;
+	CheckBox* _forensic_mark_video;
+	CheckBox* _forensic_mark_audio;
 	wxRadioButton* _forensic_mark_all_audio;
 	wxRadioButton* _forensic_mark_some_audio;
 	wxSpinCtrl* _forensic_mark_audio_up_to;
diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc
index 75971c14b..96b97b163 100644
--- a/src/wx/kdm_output_panel.cc
+++ b/src/wx/kdm_output_panel.cc
@@ -155,8 +155,8 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent)
 	_write_to->SetValue (Config::instance()->write_kdms_to_disk());
 	_email->SetValue (Config::instance()->email_kdms());
 
-	_write_to->Bind     (wxEVT_CHECKBOX, boost::bind (&KDMOutputPanel::write_to_changed, this));
-	_email->Bind        (wxEVT_CHECKBOX, boost::bind (&KDMOutputPanel::email_changed, this));
+	_write_to->bind(&KDMOutputPanel::write_to_changed, this);
+	_email->bind(&KDMOutputPanel::email_changed, this);
 	add_email_addresses->Bind (wxEVT_BUTTON, boost::bind(&KDMOutputPanel::add_email_addresses_clicked, this));
 	_write_flat->Bind   (wxEVT_RADIOBUTTON, boost::bind (&KDMOutputPanel::kdm_write_type_changed, this));
 	_write_folder->Bind (wxEVT_RADIOBUTTON, boost::bind (&KDMOutputPanel::kdm_write_type_changed, this));
diff --git a/src/wx/kdm_output_panel.h b/src/wx/kdm_output_panel.h
index 9c30e286c..040815392 100644
--- a/src/wx/kdm_output_panel.h
+++ b/src/wx/kdm_output_panel.h
@@ -29,6 +29,7 @@ LIBDCP_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 
 
+class CheckBox;
 class DirPickerCtrl;
 class Job;
 class KDMChoice;
@@ -72,7 +73,7 @@ private:
 	KDMChoice* _type;
 	NameFormatEditor* _container_name_format;
 	NameFormatEditor* _filename_format;
-	wxCheckBox* _write_to;
+	CheckBox* _write_to;
 #ifdef DCPOMATIC_USE_OWN_PICKER
 	DirPickerCtrl* _folder;
 #else
@@ -81,7 +82,7 @@ private:
 	wxRadioButton* _write_flat;
 	wxRadioButton* _write_folder;
 	wxRadioButton* _write_zip;
-	wxCheckBox* _email;
+	CheckBox* _email;
 	bool _forensic_mark_video;
 	bool _forensic_mark_audio;
 	boost::optional<int> _forensic_mark_audio_up_to;
diff --git a/src/wx/markers_dialog.cc b/src/wx/markers_dialog.cc
index 9c9850af0..cc254b2a1 100644
--- a/src/wx/markers_dialog.cc
+++ b/src/wx/markers_dialog.cc
@@ -71,7 +71,7 @@ public:
 		set_sensitivity ();
 
 		set_button->Bind (wxEVT_BUTTON, bind(&Marker::set, this));
-		checkbox->Bind (wxEVT_CHECKBOX, bind(&Marker::checkbox_clicked, this));
+		checkbox->bind(&Marker::checkbox_clicked, this);
 		timecode->Changed.connect (bind(&Marker::changed, this));
 	}
 
diff --git a/src/wx/metadata_dialog.cc b/src/wx/metadata_dialog.cc
index c6f805ed6..b7156adc3 100644
--- a/src/wx/metadata_dialog.cc
+++ b/src/wx/metadata_dialog.cc
@@ -19,6 +19,7 @@
 */
 
 
+#include "check_box.h"
 #include "dcpomatic_button.h"
 #include "dcpomatic_choice.h"
 #include "editable_list.h"
@@ -85,18 +86,18 @@ MetadataDialog::setup ()
 
 	_sign_language_video_language->Changed.connect (boost::bind(&MetadataDialog::sign_language_video_language_changed, this));
 	_edit_release_territory->Bind (wxEVT_BUTTON, boost::bind(&MetadataDialog::edit_release_territory, this));
-	_enable_release_territory->Bind (wxEVT_CHECKBOX, boost::bind(&MetadataDialog::enable_release_territory_changed, this));
-	_enable_facility->Bind (wxEVT_CHECKBOX, boost::bind(&MetadataDialog::enable_facility_changed, this));
+	_enable_release_territory->bind(&MetadataDialog::enable_release_territory_changed, this);
+	_enable_facility->bind(&MetadataDialog::enable_facility_changed, this);
 	_facility->Bind (wxEVT_TEXT, boost::bind(&MetadataDialog::facility_changed, this));
-	_enable_studio->Bind (wxEVT_CHECKBOX, boost::bind(&MetadataDialog::enable_studio_changed, this));
+	_enable_studio->bind(&MetadataDialog::enable_studio_changed, this);
 	_studio->Bind (wxEVT_TEXT, boost::bind(&MetadataDialog::studio_changed, this));
-	_enable_chain->Bind (wxEVT_CHECKBOX, boost::bind(&MetadataDialog::enable_chain_changed, this));
+	_enable_chain->bind(&MetadataDialog::enable_chain_changed, this);
 	_chain->Bind (wxEVT_TEXT, boost::bind(&MetadataDialog::chain_changed, this));
-	_temp_version->Bind (wxEVT_CHECKBOX, boost::bind(&MetadataDialog::temp_version_changed, this));
-	_pre_release->Bind (wxEVT_CHECKBOX, boost::bind(&MetadataDialog::pre_release_changed, this));
-	_red_band->Bind (wxEVT_CHECKBOX, boost::bind(&MetadataDialog::red_band_changed, this));
-	_two_d_version_of_three_d->Bind (wxEVT_CHECKBOX, boost::bind(&MetadataDialog::two_d_version_of_three_d_changed, this));
-	_enable_luminance->Bind (wxEVT_CHECKBOX, boost::bind(&MetadataDialog::enable_luminance_changed, this));
+	_temp_version->bind(&MetadataDialog::temp_version_changed, this);
+	_pre_release->bind(&MetadataDialog::pre_release_changed, this);
+	_red_band->bind(&MetadataDialog::red_band_changed, this);
+	_two_d_version_of_three_d->bind(&MetadataDialog::two_d_version_of_three_d_changed, this);
+	_enable_luminance->bind(&MetadataDialog::enable_luminance_changed, this);
 	_luminance_value->Bind (wxEVT_SPINCTRLDOUBLE, boost::bind(&MetadataDialog::luminance_changed, this));
 	_luminance_unit->Bind (wxEVT_CHOICE, boost::bind(&MetadataDialog::luminance_changed, this));
 
@@ -179,7 +180,7 @@ MetadataDialog::film_changed (ChangeType type, Film::Property property)
 void
 MetadataDialog::setup_standard (wxPanel* panel, wxSizer* sizer)
 {
-	_enable_release_territory = new wxCheckBox (panel, wxID_ANY, _("Release territory"));
+	_enable_release_territory = new CheckBox(panel, _("Release territory"));
 	sizer->Add (_enable_release_territory, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP);
 	{
 		auto s = new wxBoxSizer (wxHORIZONTAL);
@@ -264,38 +265,38 @@ MetadataDialog::setup_advanced (wxPanel* panel, wxSizer* sizer)
 	_sign_language_video_language = new LanguageTagWidget (panel, _("Language used for any sign language video track"), {}, {});
 	sizer->Add (_sign_language_video_language->sizer(), 1, wxEXPAND);
 
-	_enable_facility = new wxCheckBox (panel, wxID_ANY, _("Facility"));
+	_enable_facility = new CheckBox(panel, _("Facility"));
 	sizer->Add (_enable_facility, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL);
 	_facility = new wxTextCtrl (panel, wxID_ANY);
 	sizer->Add (_facility, 1, wxEXPAND);
 
-	_enable_studio = new wxCheckBox (panel, wxID_ANY, _("Studio"));
+	_enable_studio = new CheckBox(panel, _("Studio"));
 	sizer->Add (_enable_studio, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL);
 	_studio = new wxTextCtrl (panel, wxID_ANY);
 	sizer->Add (_studio, 1, wxEXPAND);
 
-	_enable_chain = new wxCheckBox (panel, wxID_ANY, _("Chain"));
+	_enable_chain = new CheckBox(panel, _("Chain"));
 	sizer->Add (_enable_chain, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL);
 	_chain = new wxTextCtrl (panel, wxID_ANY);
 	sizer->Add (_chain, 1, wxEXPAND);
 
-	_temp_version = new wxCheckBox (panel, wxID_ANY, _("Temporary version"));
+	_temp_version = new CheckBox(panel, _("Temporary version"));
 	sizer->Add (_temp_version, 0, wxALIGN_CENTER_VERTICAL);
 	sizer->AddSpacer (0);
 
-	_pre_release = new wxCheckBox (panel, wxID_ANY, _("Pre-release"));
+	_pre_release = new CheckBox(panel, _("Pre-release"));
 	sizer->Add (_pre_release, 0, wxALIGN_CENTER_VERTICAL);
 	sizer->AddSpacer (0);
 
-	_red_band = new wxCheckBox (panel, wxID_ANY, _("Red band"));
+	_red_band = new CheckBox(panel, _("Red band"));
 	sizer->Add (_red_band, 0, wxALIGN_CENTER_VERTICAL);
 	sizer->AddSpacer (0);
 
-	_two_d_version_of_three_d = new wxCheckBox (panel, wxID_ANY, _("2D version of 3D DCP"));
+	_two_d_version_of_three_d = new CheckBox(panel, _("2D version of 3D DCP"));
 	sizer->Add (_two_d_version_of_three_d, 0, wxALIGN_CENTER_VERTICAL);
 	sizer->AddSpacer (0);
 
-	_enable_luminance = new wxCheckBox (panel, wxID_ANY, _("Luminance"));
+	_enable_luminance = new CheckBox(panel, _("Luminance"));
 	sizer->Add (_enable_luminance, 0, wxALIGN_CENTER_VERTICAL);
 	{
 		auto s = new wxBoxSizer (wxHORIZONTAL);
diff --git a/src/wx/metadata_dialog.h b/src/wx/metadata_dialog.h
index 29d8b39cc..cda8d2ace 100644
--- a/src/wx/metadata_dialog.h
+++ b/src/wx/metadata_dialog.h
@@ -35,6 +35,7 @@ LIBDCP_ENABLE_WARNINGS
 
 
 class Button;
+class CheckBox;
 class Choice;
 class LanguageTagWidget;
 class RatingDialog;
@@ -76,7 +77,7 @@ private:
 	std::vector<dcp::Rating> ratings () const;
 	void set_ratings (std::vector<dcp::Rating> r);
 
-	wxCheckBox* _enable_release_territory;
+	CheckBox* _enable_release_territory;
 	/** The current release territory displayed in the UI; since we can't easily convert
 	 *  the string in _release_territory_text to a RegionSubtag we just store the RegionSubtag
 	 *  alongside.
@@ -85,17 +86,17 @@ private:
 	wxStaticText* _release_territory_text;
 	Button* _edit_release_territory;
 	LanguageTagWidget* _sign_language_video_language = nullptr;
-	wxCheckBox* _enable_facility;
+	CheckBox* _enable_facility;
 	wxTextCtrl* _facility;
-	wxCheckBox* _enable_chain;
+	CheckBox* _enable_chain;
 	wxTextCtrl* _chain;
-	wxCheckBox* _enable_studio;
+	CheckBox* _enable_studio;
 	wxTextCtrl* _studio;
-	wxCheckBox* _temp_version;
-	wxCheckBox* _pre_release;
-	wxCheckBox* _red_band;
-	wxCheckBox* _two_d_version_of_three_d;
-	wxCheckBox* _enable_luminance;
+	CheckBox* _temp_version;
+	CheckBox* _pre_release;
+	CheckBox* _red_band;
+	CheckBox* _two_d_version_of_three_d;
+	CheckBox* _enable_luminance;
 	wxSpinCtrlDouble* _luminance_value;
 	Choice* _luminance_unit;
 
diff --git a/src/wx/nag_dialog.cc b/src/wx/nag_dialog.cc
index 21d1c823e..04c3ce8e9 100644
--- a/src/wx/nag_dialog.cc
+++ b/src/wx/nag_dialog.cc
@@ -44,7 +44,7 @@ NagDialog::NagDialog (wxWindow* parent, Config::Nag nag, wxString message, bool
 
 	auto b = new CheckBox (this, _("Don't show this message again"));
 	sizer->Add (b, 0, wxALL, 6);
-	b->Bind (wxEVT_CHECKBOX, bind (&NagDialog::shut_up, this, _1));
+	b->bind(&NagDialog::shut_up, this, _1);
 
 	int flags = wxOK;
 	if (can_cancel) {
diff --git a/src/wx/password_entry.cc b/src/wx/password_entry.cc
index f44ed9cb0..e148169bf 100644
--- a/src/wx/password_entry.cc
+++ b/src/wx/password_entry.cc
@@ -35,7 +35,7 @@ PasswordEntry::PasswordEntry (wxWindow* parent)
 	sizer->Add (_show, 0, wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP);
 	_panel->SetSizerAndFit (sizer);
 
-	_show->Bind (wxEVT_CHECKBOX, bind(&PasswordEntry::show_clicked, this));
+	_show->bind(&PasswordEntry::show_clicked, this);
 	_text->Bind (wxEVT_TEXT, bind(boost::ref(Changed)));
 }
 
diff --git a/src/wx/paste_dialog.cc b/src/wx/paste_dialog.cc
index 429e8fe6e..f4fc5b886 100644
--- a/src/wx/paste_dialog.cc
+++ b/src/wx/paste_dialog.cc
@@ -19,8 +19,8 @@
 */
 
 
-#include "paste_dialog.h"
 #include "check_box.h"
+#include "paste_dialog.h"
 
 
 PasteDialog::PasteDialog (wxWindow* parent, bool video, bool audio, bool text)
diff --git a/src/wx/paste_dialog.h b/src/wx/paste_dialog.h
index 1f447d3f8..0be0f34b8 100644
--- a/src/wx/paste_dialog.h
+++ b/src/wx/paste_dialog.h
@@ -22,6 +22,9 @@
 #include "table_dialog.h"
 
 
+class CheckBox;
+
+
 class PasteDialog : public TableDialog
 {
 public:
@@ -32,7 +35,7 @@ public:
 	bool text () const;
 
 private:
-	wxCheckBox* _video;
-	wxCheckBox* _audio;
-	wxCheckBox* _text;
+	CheckBox* _video;
+	CheckBox* _audio;
+	CheckBox* _text;
 };
diff --git a/src/wx/player_config_dialog.cc b/src/wx/player_config_dialog.cc
index be310a931..0312a6621 100644
--- a/src/wx/player_config_dialog.cc
+++ b/src/wx/player_config_dialog.cc
@@ -133,7 +133,7 @@ private:
 		_player_mode->Bind (wxEVT_CHOICE, bind(&PlayerGeneralPage::player_mode_changed, this));
 		_image_display->Bind (wxEVT_CHOICE, bind(&PlayerGeneralPage::image_display_changed, this));
 		_video_display_mode->Bind (wxEVT_CHOICE, bind(&PlayerGeneralPage::video_display_mode_changed, this));
-		_respect_kdm->Bind (wxEVT_CHECKBOX, bind(&PlayerGeneralPage::respect_kdm_changed, this));
+		_respect_kdm->bind(&PlayerGeneralPage::respect_kdm_changed, this);
 		_debug_log_file->Bind (wxEVT_FILEPICKER_CHANGED, bind(&PlayerGeneralPage::debug_log_file_changed, this));
 	}
 
@@ -214,7 +214,7 @@ private:
 	wxChoice* _player_mode;
 	wxChoice* _image_display;
 	wxChoice* _video_display_mode;
-	wxCheckBox* _respect_kdm;
+	CheckBox* _respect_kdm;
 	FilePickerCtrl* _debug_log_file;
 };
 
@@ -284,12 +284,12 @@ private:
 		table->AddSpacer (0);
 #endif
 
-		_log_general->Bind (wxEVT_CHECKBOX, boost::bind (&PlayerAdvancedPage::log_changed, this));
-		_log_warning->Bind (wxEVT_CHECKBOX, boost::bind (&PlayerAdvancedPage::log_changed, this));
-		_log_error->Bind (wxEVT_CHECKBOX, boost::bind (&PlayerAdvancedPage::log_changed, this));
-		_log_timing->Bind (wxEVT_CHECKBOX, boost::bind (&PlayerAdvancedPage::log_changed, this));
+		_log_general->bind(&PlayerAdvancedPage::log_changed, this);
+		_log_warning->bind(&PlayerAdvancedPage::log_changed, this);
+		_log_error->bind(&PlayerAdvancedPage::log_changed, this);
+		_log_timing->bind(&PlayerAdvancedPage::log_changed, this);
 #ifdef DCPOMATIC_WINDOWS
-		_win32_console->Bind (wxEVT_CHECKBOX, boost::bind (&PlayerAdvancedPage::win32_console_changed, this));
+		_win32_console->bind(&PlayerAdvancedPage::win32_console_changed, this);
 #endif
 	}
 
@@ -331,12 +331,12 @@ private:
 	}
 #endif
 
-	wxCheckBox* _log_general;
-	wxCheckBox* _log_warning;
-	wxCheckBox* _log_error;
-	wxCheckBox* _log_timing;
+	CheckBox* _log_general;
+	CheckBox* _log_warning;
+	CheckBox* _log_error;
+	CheckBox* _log_timing;
 #ifdef DCPOMATIC_WINDOWS
-	wxCheckBox* _win32_console;
+	CheckBox* _win32_console;
 #endif
 };
 
diff --git a/src/wx/recreate_chain_dialog.cc b/src/wx/recreate_chain_dialog.cc
index 92e71af34..59fbeb6c7 100644
--- a/src/wx/recreate_chain_dialog.cc
+++ b/src/wx/recreate_chain_dialog.cc
@@ -38,9 +38,9 @@ RecreateChainDialog::RecreateChainDialog (wxWindow* parent, wxString title, wxSt
 	_sizer->Add (new StaticText (this, message), 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
 
 	if (nag) {
-		wxCheckBox* shut_up = new CheckBox (this, _("Don't ask this again"));
+		auto shut_up = new CheckBox (this, _("Don't ask this again"));
 		_sizer->Add (shut_up, 0, wxALL, DCPOMATIC_DIALOG_BORDER);
-		shut_up->Bind (wxEVT_CHECKBOX, bind (&RecreateChainDialog::shut_up, this, _1));
+		shut_up->bind(&RecreateChainDialog::shut_up, this, _1);
 	}
 
 	layout ();
diff --git a/src/wx/smpte_metadata_dialog.cc b/src/wx/smpte_metadata_dialog.cc
index afcbfafce..f5d63e329 100644
--- a/src/wx/smpte_metadata_dialog.cc
+++ b/src/wx/smpte_metadata_dialog.cc
@@ -19,6 +19,7 @@
 */
 
 
+#include "check_box.h"
 #include "content_version_dialog.h"
 #include "editable_list.h"
 #include "language_tag_dialog.h"
@@ -90,7 +91,7 @@ SMPTEMetadataDialog::setup_advanced (wxPanel* panel, wxSizer* sizer)
 	_status = new wxChoice (panel, wxID_ANY);
 	sizer->Add (_status, 0);
 
-	_enable_distributor = new wxCheckBox (panel, wxID_ANY, _("Distributor"));
+	_enable_distributor = new CheckBox(panel, _("Distributor"));
 	sizer->Add (_enable_distributor, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL);
 	_distributor = new wxTextCtrl (panel, wxID_ANY);
 	sizer->Add (_distributor, 1, wxEXPAND);
@@ -138,7 +139,7 @@ SMPTEMetadataDialog::setup ()
 	_name_language->Changed.connect (boost::bind(&SMPTEMetadataDialog::name_language_changed, this, _1));
 	_version_number->Bind (wxEVT_SPINCTRL, boost::bind(&SMPTEMetadataDialog::version_number_changed, this));
 	_status->Bind (wxEVT_CHOICE, boost::bind(&SMPTEMetadataDialog::status_changed, this));
-	_enable_distributor->Bind (wxEVT_CHECKBOX, boost::bind(&SMPTEMetadataDialog::enable_distributor_changed, this));
+	_enable_distributor->bind(&SMPTEMetadataDialog::enable_distributor_changed, this);
 	_distributor->Bind (wxEVT_TEXT, boost::bind(&SMPTEMetadataDialog::distributor_changed, this));
 
 	film_changed (ChangeType::DONE, Film::Property::NAME_LANGUAGE);
diff --git a/src/wx/smpte_metadata_dialog.h b/src/wx/smpte_metadata_dialog.h
index 8193e172c..b6301e883 100644
--- a/src/wx/smpte_metadata_dialog.h
+++ b/src/wx/smpte_metadata_dialog.h
@@ -63,7 +63,7 @@ private:
 	LanguageTagWidget* _name_language;
 	wxSpinCtrl* _version_number;
 	wxChoice* _status;
-	wxCheckBox* _enable_distributor;
+	CheckBox* _enable_distributor;
 	wxTextCtrl* _distributor;
 	EditableList<std::string, ContentVersionDialog>* _content_versions;
 };
diff --git a/src/wx/subtitle_appearance_dialog.cc b/src/wx/subtitle_appearance_dialog.cc
index 4203d90e6..d88f74725 100644
--- a/src/wx/subtitle_appearance_dialog.cc
+++ b/src/wx/subtitle_appearance_dialog.cc
@@ -204,11 +204,11 @@ SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr
 
 	_outline_width->SetValue (_text->outline_width ());
 
-	_force_colour->Bind (wxEVT_CHECKBOX, bind (&SubtitleAppearanceDialog::setup_sensitivity, this));
-	_force_effect_colour->Bind (wxEVT_CHECKBOX, bind (&SubtitleAppearanceDialog::setup_sensitivity, this));
-	_force_effect->Bind (wxEVT_CHECKBOX, bind (&SubtitleAppearanceDialog::setup_sensitivity, this));
-	_force_fade_in->Bind (wxEVT_CHECKBOX, bind (&SubtitleAppearanceDialog::setup_sensitivity, this));
-	_force_fade_out->Bind (wxEVT_CHECKBOX, bind (&SubtitleAppearanceDialog::setup_sensitivity, this));
+	_force_colour->bind(&SubtitleAppearanceDialog::setup_sensitivity, this);
+	_force_effect_colour->bind(&SubtitleAppearanceDialog::setup_sensitivity, this);
+	_force_effect->bind(&SubtitleAppearanceDialog::setup_sensitivity, this);
+	_force_fade_in->bind(&SubtitleAppearanceDialog::setup_sensitivity, this);
+	_force_fade_out->bind(&SubtitleAppearanceDialog::setup_sensitivity, this);
 	_effect->Bind (wxEVT_CHOICE, bind (&SubtitleAppearanceDialog::setup_sensitivity, this));
 	_content_connection = _content->Change.connect (bind (&SubtitleAppearanceDialog::content_change, this, _1));
 
@@ -223,7 +223,7 @@ SubtitleAppearanceDialog::content_change (ChangeType type)
 	}
 }
 
-wxCheckBox*
+CheckBox*
 SubtitleAppearanceDialog::set_to (wxWindow* w, int& r)
 {
 	auto s = new wxBoxSizer (wxHORIZONTAL);
diff --git a/src/wx/subtitle_appearance_dialog.h b/src/wx/subtitle_appearance_dialog.h
index f023b73ae..cef264590 100644
--- a/src/wx/subtitle_appearance_dialog.h
+++ b/src/wx/subtitle_appearance_dialog.h
@@ -29,16 +29,16 @@ LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 
-class wxRadioButton;
-class wxColourPickerCtrl;
-class wxGridBagSizer;
+class CheckBox;
 class Content;
-class RGBAColourPicker;
 class FFmpegSubtitleStream;
-class wxCheckBox;
-class wxWidget;
 class Film;
 class Job;
+class RGBAColourPicker;
+class wxColourPickerCtrl;
+class wxGridBagSizer;
+class wxRadioButton;
+class wxWidget;
 
 
 class SubtitleAppearanceDialog : public wxDialog
@@ -51,21 +51,21 @@ public:
 private:
 	void setup_sensitivity ();
 	void restore ();
-	wxCheckBox* set_to (wxWindow* w, int& r);
+	CheckBox* set_to (wxWindow* w, int& r);
 	void content_change (ChangeType type);
 	void active_jobs_changed (boost::optional<std::string> last);
 	void add_colours ();
 
 	std::weak_ptr<const Film> _film;
-	wxCheckBox* _force_colour;
+	CheckBox* _force_colour;
 	wxColourPickerCtrl* _colour;
-	wxCheckBox* _force_effect;
+	CheckBox* _force_effect;
 	wxChoice* _effect;
-	wxCheckBox* _force_effect_colour;
+	CheckBox* _force_effect_colour;
 	wxColourPickerCtrl* _effect_colour;
-	wxCheckBox* _force_fade_in;
+	CheckBox* _force_fade_in;
 	Timecode<dcpomatic::ContentTime>* _fade_in;
-	wxCheckBox* _force_fade_out;
+	CheckBox* _force_fade_out;
 	Timecode<dcpomatic::ContentTime>* _fade_out;
 	wxSpinCtrl* _outline_width;
 	wxGridBagSizer* _table;
diff --git a/src/wx/text_panel.cc b/src/wx/text_panel.cc
index 19bac8e8e..7e6557ba9 100644
--- a/src/wx/text_panel.cc
+++ b/src/wx/text_panel.cc
@@ -126,10 +126,10 @@ TextPanel::create ()
 	_y_scale->SetRange (0, 1000);
 	_line_spacing->SetRange (0, 1000);
 
-	_reference->Bind                (wxEVT_CHECKBOX, boost::bind (&TextPanel::reference_clicked, this));
-	_use->Bind                      (wxEVT_CHECKBOX, boost::bind (&TextPanel::use_toggled, this));
+	_reference->bind(&TextPanel::reference_clicked, this);
+	_use->bind(&TextPanel::use_toggled, this);
 	_type->Bind                     (wxEVT_CHOICE,   boost::bind (&TextPanel::type_changed, this));
-	_burn->Bind                     (wxEVT_CHECKBOX, boost::bind (&TextPanel::burn_toggled, this));
+	_burn->bind(&TextPanel::burn_toggled, this);
 	_x_offset->Bind                 (wxEVT_SPINCTRL, boost::bind (&TextPanel::x_offset_changed, this));
 	_y_offset->Bind                 (wxEVT_SPINCTRL, boost::bind (&TextPanel::y_offset_changed, this));
 	_x_scale->Bind                  (wxEVT_SPINCTRL, boost::bind (&TextPanel::x_scale_changed, this));
@@ -162,7 +162,7 @@ TextPanel::setup_visibility ()
 		}
 		if (!_outline_subtitles) {
 			_outline_subtitles = new CheckBox (this, _("Show subtitle area"));
-			_outline_subtitles->Bind (wxEVT_CHECKBOX, boost::bind (&TextPanel::outline_subtitles_changed, this));
+			_outline_subtitles->bind(&TextPanel::outline_subtitles_changed, this);
 			_grid->Add (_outline_subtitles, wxGBPosition(_outline_subtitles_row, 0), wxGBSpan(1, 2));
 		}
 		if (!_language) {
diff --git a/src/wx/text_panel.h b/src/wx/text_panel.h
index c4498f970..dc8f685f1 100644
--- a/src/wx/text_panel.h
+++ b/src/wx/text_panel.h
@@ -22,7 +22,7 @@
 #include "content_sub_panel.h"
 
 
-class wxCheckBox;
+class CheckBox;
 class wxSpinCtrl;
 class LanguageTagWidget;
 class TextView;
@@ -72,12 +72,12 @@ private:
 	void update_outline_subtitles_in_viewer ();
 	void clear_outline_subtitles ();
 
-	wxCheckBox* _reference;
+	CheckBox* _reference;
 	wxStaticText* _reference_note;
-	wxCheckBox* _outline_subtitles = nullptr;
-	wxCheckBox* _use;
+	CheckBox* _outline_subtitles = nullptr;
+	CheckBox* _use;
 	wxChoice* _type;
-	wxCheckBox* _burn;
+	CheckBox* _burn;
 	wxStaticText* _offset_label;
 	wxStaticText* _x_offset_label;
 	wxStaticText* _x_offset_pc_label;
diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index e866c59a7..e1770efbe 100644
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -220,7 +220,7 @@ VideoPanel::create ()
 	_fade_in->Changed.connect (boost::bind (&VideoPanel::fade_in_changed, this));
 	_fade_out->Changed.connect (boost::bind (&VideoPanel::fade_out_changed, this));
 
-	_reference->Bind                     (wxEVT_CHECKBOX, boost::bind (&VideoPanel::reference_clicked, this));
+	_reference->bind(&VideoPanel::reference_clicked, this);
 	_scale_fit->Bind                     (wxEVT_RADIOBUTTON, boost::bind (&VideoPanel::scale_fit_clicked, this));
 	_scale_custom->Bind                  (wxEVT_RADIOBUTTON, boost::bind (&VideoPanel::scale_custom_clicked, this));
 	_scale_custom_edit->Bind             (wxEVT_BUTTON,   boost::bind (&VideoPanel::scale_custom_edit_clicked, this));
diff --git a/src/wx/video_panel.h b/src/wx/video_panel.h
index e67b22ded..752e37765 100644
--- a/src/wx/video_panel.h
+++ b/src/wx/video_panel.h
@@ -29,6 +29,8 @@
 #include "timecode.h"
 #include "lib/film.h"
 
+
+class CheckBox;
 class wxButton;
 class wxChoice;
 class wxSpinCtrl;
@@ -70,7 +72,7 @@ private:
 	void setup_description ();
 	void setup_sensitivity ();
 
-	wxCheckBox* _reference;
+	CheckBox* _reference;
 	wxStaticText* _reference_note;
 	wxStaticText* _type_label;
 	ContentChoice<VideoContent, VideoFrameType>* _frame_type;