projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix missing xsd file in windows installer.
[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 d0fb74823e97bc518e3e35bcdfbc06001f25b791..84fb47e5adb2a38c66232cc656a9c21053aebe77 100644
(file)
--- a/
src/wx/content_colour_conversion_dialog.h
+++ b/
src/wx/content_colour_conversion_dialog.h
@@
-20,7
+20,10
@@
#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>
#include <boost/signals2.hpp>
@@
-40,7
+43,7
@@
private:
void preset_check_clicked ();
void preset_choice_changed ();
void preset_check_clicked ();
void preset_choice_changed ();
-
wx
CheckBox* _preset_check;
+ CheckBox* _preset_check;
wxChoice* _preset_choice;
ColourConversionEditor* _editor;
bool _setting;
wxChoice* _preset_choice;
ColourConversionEditor* _editor;
bool _setting;