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
/
timeline_time_axis_view.cc
diff --git
a/src/wx/timeline_time_axis_view.cc
b/src/wx/timeline_time_axis_view.cc
index 046ddaf3f2b301f7f4495cc2dd18e7d451465d34..023b42ec79ed4342958d9fec4605ac6424475ba0 100644
(file)
--- a/
src/wx/timeline_time_axis_view.cc
+++ b/
src/wx/timeline_time_axis_view.cc
@@
-18,14
+18,15
@@
*/
*/
+
#include "timeline.h"
#include "timeline_time_axis_view.h"
#include "wx_util.h"
#include "timeline.h"
#include "timeline_time_axis_view.h"
#include "wx_util.h"
-#include
"lib/warnings.h"
-
DCPOMATIC
_DISABLE_WARNINGS
+#include
<dcp/warnings.h>
+
LIBDCP
_DISABLE_WARNINGS
#include <wx/graphics.h>
#include <wx/wx.h>
#include <wx/graphics.h>
#include <wx/wx.h>
-
DCPOMATIC
_ENABLE_WARNINGS
+
LIBDCP
_ENABLE_WARNINGS
using std::cout;
using std::cout;