projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Double-click to edit cinemas/screens.
[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 731cf95396181cc9ef72814ee56f9533c903b3e5..afd13e17e2fc8612c280dcd88517bdbaecd8752a 100644
(file)
--- a/
src/wx/rgba_colour_picker.cc
+++ b/
src/wx/rgba_colour_picker.cc
@@
-21,10
+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
"lib/warnings.h"
-
DCPOMATIC
_DISABLE_WARNINGS
+#include
<dcp/warnings.h>
+
LIBDCP
_DISABLE_WARNINGS
#include <wx/clrpicker.h>
#include <wx/clrpicker.h>
-
DCPOMATIC
_ENABLE_WARNINGS
+
LIBDCP
_ENABLE_WARNINGS
RGBAColourPicker::RGBAColourPicker (wxWindow* parent, RGBA colour)
: wxPanel (parent, wxID_ANY)
RGBAColourPicker::RGBAColourPicker (wxWindow* parent, RGBA colour)
: wxPanel (parent, wxID_ANY)