projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Rearrange subtitle font management.
[dcpomatic.git]
/
src
/
wx
/
timeline_time_axis_view.cc
diff --git
a/src/wx/timeline_time_axis_view.cc
b/src/wx/timeline_time_axis_view.cc
index 3cdcfc2c85604bd283ae025d8b9d2975695d300f..023b42ec79ed4342958d9fec4605ac6424475ba0 100644
(file)
--- a/
src/wx/timeline_time_axis_view.cc
+++ b/
src/wx/timeline_time_axis_view.cc
@@
-18,11
+18,15
@@
*/
+
#include "timeline.h"
#include "timeline_time_axis_view.h"
#include "wx_util.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/graphics.h>
#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
using std::cout;