projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Add basic KDM information to the player (#2225).
[dcpomatic.git]
/
src
/
wx
/
timeline_reels_view.cc
diff --git
a/src/wx/timeline_reels_view.cc
b/src/wx/timeline_reels_view.cc
index cf1abb34f6b961f21fd6552ab66c6a4911e562d9..331f6580df9ff4ce6bb0258e02d1449a4209cfc3 100644
(file)
--- a/
src/wx/timeline_reels_view.cc
+++ b/
src/wx/timeline_reels_view.cc
@@
-19,10
+19,13
@@
*/
-#include "timeline_reels_view.h"
#include "timeline.h"
-#include <wx/wx.h>
+#include "timeline_reels_view.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/graphics.h>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
using std::min;