projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use libdcp's warnings.h
[dcpomatic.git]
/
src
/
wx
/
content_colour_conversion_dialog.h
diff --git
a/src/wx/content_colour_conversion_dialog.h
b/src/wx/content_colour_conversion_dialog.h
index 471c1f8849dad60688d489e45e91d57dfd2a0aeb..e42961019a0bb7cf6f8f36f0a88fbcc6605b3809 100644
(file)
--- a/
src/wx/content_colour_conversion_dialog.h
+++ b/
src/wx/content_colour_conversion_dialog.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013-20
15
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-20
21
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,11
+18,18
@@
*/
*/
+
#include "lib/colour_conversion.h"
#include "lib/colour_conversion.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/wx.h>
#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
+#include <boost/signals2.hpp>
+
class ColourConversionEditor;
class ColourConversionEditor;
+
class ContentColourConversionDialog : public wxDialog
{
public:
class ContentColourConversionDialog : public wxDialog
{
public:
@@
-43,3
+50,4
@@
private:
boost::signals2::scoped_connection _editor_connection;
};
boost::signals2::scoped_connection _editor_connection;
};
+