projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ContentMenu was keeping its initial film and not using the current one; should fix...
[dcpomatic.git]
/
src
/
wx
/
content_menu.h
diff --git
a/src/wx/content_menu.h
b/src/wx/content_menu.h
index 9f4bd4cc4378059d116fc8d071660826ca6e0ac2..a9f9093c6ab5bb3c94d48244480bc1859495bbf2 100644
(file)
--- a/
src/wx/content_menu.h
+++ b/
src/wx/content_menu.h
@@
-30,10
+30,10
@@
class Film;
class ContentMenu
{
public:
class ContentMenu
{
public:
- ContentMenu (
boost::shared_ptr<Film>,
wxWindow *);
+ ContentMenu (wxWindow *);
~ContentMenu ();
~ContentMenu ();
- void popup (ContentList, wxPoint);
+ void popup (
boost::weak_ptr<Film>,
ContentList, wxPoint);
private:
void repeat ();
private:
void repeat ();
@@
-43,6
+43,7
@@
private:
void maybe_found_missing (boost::weak_ptr<Job>, boost::weak_ptr<Content>, boost::weak_ptr<Content>);
wxMenu* _menu;
void maybe_found_missing (boost::weak_ptr<Job>, boost::weak_ptr<Content>, boost::weak_ptr<Content>);
wxMenu* _menu;
+ /** Film that we are working with; set up by popup() */
boost::weak_ptr<Film> _film;
wxWindow* _parent;
ContentList _content;
boost::weak_ptr<Film> _film;
wxWindow* _parent;
ContentList _content;