projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: stack-allocated dialogs.
[dcpomatic.git]
/
src
/
wx
/
timeline_content_view.h
diff --git
a/src/wx/timeline_content_view.h
b/src/wx/timeline_content_view.h
index 7087e9641b62cd7073792cfa97441ff89b0fabd8..7794120cdc96762880e944bb14baf1b58b12503e 100644
(file)
--- a/
src/wx/timeline_content_view.h
+++ b/
src/wx/timeline_content_view.h
@@
-23,13
+23,12
@@
#define DCPOMATIC_TIMELINE_CONTENT_VIEW_H
#define DCPOMATIC_TIMELINE_CONTENT_VIEW_H
-#include "lib/change_signaller.h"
-#include "lib/types.h"
-#include "lib/warnings.h"
#include "timeline_view.h"
#include "timeline_view.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include "lib/change_signaller.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/wx.h>
#include <wx/wx.h>
-
DCPOMATIC
_ENABLE_WARNINGS
+
LIBDCP
_ENABLE_WARNINGS
#include <boost/signals2.hpp>
class Content;
#include <boost/signals2.hpp>
class Content;
@@
-64,7
+63,6
@@
protected:
private:
void do_paint (wxGraphicsContext* gc, std::list<dcpomatic::Rect<int>> overlaps) override;
private:
void do_paint (wxGraphicsContext* gc, std::list<dcpomatic::Rect<int>> overlaps) override;
- int y_pos (int t) const;
void content_change (ChangeType type, int p);
boost::optional<int> _track;
void content_change (ChangeType type, int p);
boost::optional<int> _track;