Merge master.

1 files changed, 2 insertions, 0 deletions

diff --git a/src/wx/video_panel.h b/src/wx/video_panel.h
index aa0c6ed53..28d6aa4bb 100644
--- a/src/wx/video_panel.h
+++ b/src/wx/video_panel.h
@@ -45,6 +45,7 @@ public:
 
 private:
 	void edit_filters_clicked ();
+	void enable_colour_conversion_clicked ();
 	void edit_colour_conversion_clicked ();
 	void fade_in_changed ();
 	void fade_out_changed ();
@@ -62,6 +63,7 @@ private:
 	wxStaticText* _description;
 	wxStaticText* _filters;
 	wxButton* _filters_button;
+	wxCheckBox* _enable_colour_conversion;
 	wxStaticText* _colour_conversion;
 	wxButton* _colour_conversion_button;
 };