projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix crash when starting two batch converters at the same time.
[dcpomatic.git]
/
src
/
wx
/
rgba_colour_picker.cc
diff --git
a/src/wx/rgba_colour_picker.cc
b/src/wx/rgba_colour_picker.cc
index 6ea3571a102799c085ab6b7d460959b3a3e66e4c..afd13e17e2fc8612c280dcd88517bdbaecd8752a 100644
(file)
--- a/
src/wx/rgba_colour_picker.cc
+++ b/
src/wx/rgba_colour_picker.cc
@@
-21,7
+21,10
@@
#include "rgba_colour_picker.h"
#include "wx_util.h"
#include "static_text.h"
#include "rgba_colour_picker.h"
#include "wx_util.h"
#include "static_text.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/clrpicker.h>
#include <wx/clrpicker.h>
+LIBDCP_ENABLE_WARNINGS
RGBAColourPicker::RGBAColourPicker (wxWindow* parent, RGBA colour)
: wxPanel (parent, wxID_ANY)
RGBAColourPicker::RGBAColourPicker (wxWindow* parent, RGBA colour)
: wxPanel (parent, wxID_ANY)