projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add bind().
[dcpomatic.git]
/
src
/
wx
/
content_menu.h
diff --git
a/src/wx/content_menu.h
b/src/wx/content_menu.h
index ebbdf5b60e254021165eaa54b53ad491fb21413b..783a5be04067c83ff524f2b35888eb8c1dc73e88 100644
(file)
--- a/
src/wx/content_menu.h
+++ b/
src/wx/content_menu.h
@@
-42,7
+42,7
@@
class Job;
class ContentMenu
{
public:
class ContentMenu
{
public:
- ContentMenu
(wxWindow* parent, std::weak_ptr<FilmViewer>
viewer);
+ ContentMenu
(wxWindow* parent, FilmViewer&
viewer);
ContentMenu (ContentMenu const &) = delete;
ContentMenu& operator= (ContentMenu const &) = delete;
ContentMenu (ContentMenu const &) = delete;
ContentMenu& operator= (ContentMenu const &) = delete;
@@
-69,7
+69,7
@@
private:
std::weak_ptr<Film> _film;
wxWindow* _parent;
bool _pop_up_open;
std::weak_ptr<Film> _film;
wxWindow* _parent;
bool _pop_up_open;
-
std::weak_ptr<FilmViewer>
_viewer;
+
FilmViewer&
_viewer;
ContentList _content;
TimelineContentViewList _views;
wxMenuItem* _repeat;
ContentList _content;
TimelineContentViewList _views;
wxMenuItem* _repeat;