X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcolour_conversion_editor.h;h=de5ffb794febeb1c35217c6a15680d03fdcc36da;hb=0c66eff01358e75ff524f395aeb634ec34a47313;hp=294cdbf82627fbccaa2f2ff0c7121fa38b7b8c7b;hpb=b9a1ad3df5f9d85fb7439efd93fede72b9b078af;p=dcpomatic.git

diff --git a/src/wx/colour_conversion_editor.h b/src/wx/colour_conversion_editor.h
index 294cdbf82..de5ffb794 100644
--- a/src/wx/colour_conversion_editor.h
+++ b/src/wx/colour_conversion_editor.h
@@ -23,10 +23,10 @@
 #define DCPOMATIC_COLOUR_CONVERSION_EDITOR_H
 
 
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 
@@ -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];
 };