projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hand-apply a2f81da6d9afc5d3b5e647e1e05ca5d4507af42c from master;
[dcpomatic.git]
/
src
/
wx
/
content_menu.h
diff --git
a/src/wx/content_menu.h
b/src/wx/content_menu.h
index 996091f0cf59883a548ddb6c1f508d653e939aee..5f2a7f7b6dd35c0bbdbbd5b7ca29bb38fbe602ca 100644
(file)
--- a/
src/wx/content_menu.h
+++ b/
src/wx/content_menu.h
@@
-23,6
+23,7
@@
#include <wx/wx.h>
#include <boost/shared_ptr.hpp>
#include <boost/weak_ptr.hpp>
#include <wx/wx.h>
#include <boost/shared_ptr.hpp>
#include <boost/weak_ptr.hpp>
+#include "timeline_content_view.h"
#include "lib/types.h"
class Film;
#include "lib/types.h"
class Film;
@@
-33,7
+34,7
@@
public:
ContentMenu (wxWindow* p);
~ContentMenu ();
ContentMenu (wxWindow* p);
~ContentMenu ();
- void popup (boost::weak_ptr<Film>, ContentList, wxPoint);
+ void popup (boost::weak_ptr<Film>, ContentList,
TimelineContentViewList,
wxPoint);
private:
void repeat ();
private:
void repeat ();
@@
-49,6
+50,7
@@
private:
boost::weak_ptr<Film> _film;
wxWindow* _parent;
ContentList _content;
boost::weak_ptr<Film> _film;
wxWindow* _parent;
ContentList _content;
+ TimelineContentViewList _views;
wxMenuItem* _repeat;
wxMenuItem* _join;
wxMenuItem* _find_missing;
wxMenuItem* _repeat;
wxMenuItem* _join;
wxMenuItem* _find_missing;