21cb435ed5eb250a7f94887ddd75f6b367ea231f from master; better colour conversion selection.

1 files changed, 3 insertions, 4 deletions

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