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
/
text_panel.cc
diff --git
a/src/wx/text_panel.cc
b/src/wx/text_panel.cc
index a841d1654db52f9175f8b2263a9b125c7b9e57aa..8cb4166c11bd7f51446ba961c87f3468499f4151 100644
(file)
--- a/
src/wx/text_panel.cc
+++ b/
src/wx/text_panel.cc
@@
-45,10
+45,10
@@
#include "lib/string_text_file_decoder.h"
#include "lib/subtitle_analysis.h"
#include "lib/text_content.h"
#include "lib/string_text_file_decoder.h"
#include "lib/subtitle_analysis.h"
#include "lib/text_content.h"
-#include
"lib/warnings.h"
-
DCPOMATIC
_DISABLE_WARNINGS
+#include
<dcp/warnings.h>
+
LIBDCP
_DISABLE_WARNINGS
#include <wx/spinctrl.h>
#include <wx/spinctrl.h>
-
DCPOMATIC
_ENABLE_WARNINGS
+
LIBDCP
_ENABLE_WARNINGS
using std::cout;
using std::cout;