projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Extract marker strings out to a separate method.
[dcpomatic.git]
/
src
/
wx
/
timeline.cc
diff --git
a/src/wx/timeline.cc
b/src/wx/timeline.cc
index 645cb3de3a5e876055177e8126894721e2b1e142..c2c2a8552d6a0edf2806b770dff84b45699d383d 100644
(file)
--- a/
src/wx/timeline.cc
+++ b/
src/wx/timeline.cc
@@
-38,7
+38,10
@@
#include "lib/text_content.h"
#include "lib/timer.h"
#include "lib/video_content.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/graphics.h>
+LIBDCP_ENABLE_WARNINGS
#include <iterator>
#include <list>