Supporters update.

[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 f609daae492d855a86849ad63c5f1905b6fa03d0..de5ffb794febeb1c35217c6a15680d03fdcc36da 100644 (file)
--- a/src/wx/colour_conversion_editor.h
+++ b/src/wx/colour_conversion_editor.h
@@ -23,13 +23,16 @@
 #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 ColourConversion;
 class wxGridBagSizer;
 class wxSpinCtrlDouble;
-class ColourConversion;
 
 
 class ColourConversionEditor : public wxPanel
@@ -44,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 ();
@@ -76,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];
 };