projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump libdcp for fixes to font handling in combine operations.
[dcpomatic.git]
/
src
/
wx
/
normal_job_view.cc
diff --git
a/src/wx/normal_job_view.cc
b/src/wx/normal_job_view.cc
index 9d29efd578a8f313e28412e3b7e030dc7d624002..016fb225559b3d56175f011995f388252616e600 100644
(file)
--- a/
src/wx/normal_job_view.cc
+++ b/
src/wx/normal_job_view.cc
@@
-22,10
+22,10
@@
#include "dcpomatic_button.h"
#include "normal_job_view.h"
#include "lib/job.h"
#include "dcpomatic_button.h"
#include "normal_job_view.h"
#include "lib/job.h"
-#include
"lib/warnings.h"
-
DCPOMATIC
_DISABLE_WARNINGS
+#include
<dcp/warnings.h>
+
LIBDCP
_DISABLE_WARNINGS
#include <wx/wx.h>
#include <wx/wx.h>
-
DCPOMATIC
_ENABLE_WARNINGS
+
LIBDCP
_ENABLE_WARNINGS
using std::shared_ptr;
using std::shared_ptr;