Dolby is apparently recreating all their certificates (as they will soon expire)...

[dcpomatic.git] / src / wx / colour_conversion_editor.h

diff --git a/src/wx/colour_conversion_editor.h b/src/wx/colour_conversion_editor.h
index 787b615d5148741981601883ee07e0b9c8fedc2d..de5ffb794febeb1c35217c6a15680d03fdcc36da 100644 (file)
--- a/src/wx/colour_conversion_editor.h
+++ b/src/wx/colour_conversion_editor.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,14 +18,22 @@
 
 */
 
+
 #ifndef DCPOMATIC_COLOUR_CONVERSION_EDITOR_H
 #define DCPOMATIC_COLOUR_CONVERSION_EDITOR_H
 
-#include <boost/signals2.hpp>
+
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
+#include <boost/signals2.hpp>
+
 
-class wxSpinCtrlDouble;
 class ColourConversion;
+class wxGridBagSizer;
+class wxSpinCtrlDouble;
+
 
 class ColourConversionEditor : public wxPanel
 {
@@ -39,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 ();
@@ -71,12 +79,14 @@ 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];
 };
 
+
 #endif
+