diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-12-28 23:49:56 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-12-28 23:49:56 +0000 |
| commit | 4014143952f791973d94c5cfb5bec9e97d1462b7 (patch) | |
| tree | b6abe43ed1b7452d65e12accc5b358c3b58cdbcd /src/wx/content_menu.h | |
| parent | 5c6292315aa7c31a076e8ace513f62e062440a33 (diff) | |
ContentMenu was keeping its initial film and not using the current one; should fix #255.
Diffstat (limited to 'src/wx/content_menu.h')
| -rw-r--r-- | src/wx/content_menu.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/wx/content_menu.h b/src/wx/content_menu.h index 9f4bd4cc4..a9f9093c6 100644 --- a/src/wx/content_menu.h +++ b/src/wx/content_menu.h @@ -30,10 +30,10 @@ class Film; class ContentMenu { public: - ContentMenu (boost::shared_ptr<Film>, wxWindow *); + ContentMenu (wxWindow *); ~ContentMenu (); - void popup (ContentList, wxPoint); + void popup (boost::weak_ptr<Film>, ContentList, wxPoint); 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; + /** Film that we are working with; set up by popup() */ boost::weak_ptr<Film> _film; wxWindow* _parent; ContentList _content; |
