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
/
standard_controls.cc
diff --git
a/src/wx/standard_controls.cc
b/src/wx/standard_controls.cc
index cef06d29cf695c1af92e8e9e1255b2fc7ac2b2f0..a2914d77ba0727f866bf1b874e63e9babd2b50a2 100644
(file)
--- a/
src/wx/standard_controls.cc
+++ b/
src/wx/standard_controls.cc
@@
-21,11
+21,11
@@
#include "film_viewer.h"
#include "standard_controls.h"
#include "film_viewer.h"
#include "standard_controls.h"
-#include
"lib/warnings.h"
-
DCPOMATIC
_DISABLE_WARNINGS
+#include
<dcp/warnings.h>
+
LIBDCP
_DISABLE_WARNINGS
#include <wx/tglbtn.h>
#include <wx/wx.h>
#include <wx/tglbtn.h>
#include <wx/wx.h>
-
DCPOMATIC
_ENABLE_WARNINGS
+
LIBDCP
_ENABLE_WARNINGS
using std::shared_ptr;
using std::shared_ptr;