summaryrefslogtreecommitdiff
path: root/src/wx/content_menu.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-12-28 23:49:56 +0000
committerCarl Hetherington <cth@carlh.net>2013-12-28 23:49:56 +0000
commit4014143952f791973d94c5cfb5bec9e97d1462b7 (patch)
treeb6abe43ed1b7452d65e12accc5b358c3b58cdbcd /src/wx/content_menu.cc
parent5c6292315aa7c31a076e8ace513f62e062440a33 (diff)
ContentMenu was keeping its initial film and not using the current one; should fix #255.
Diffstat (limited to 'src/wx/content_menu.cc')
-rw-r--r--src/wx/content_menu.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc
index 6372503d1..b91c82ab1 100644
--- a/src/wx/content_menu.cc
+++ b/src/wx/content_menu.cc
@@ -43,9 +43,8 @@ enum {
ID_remove
};
-ContentMenu::ContentMenu (shared_ptr<Film> f, wxWindow* p)
+ContentMenu::ContentMenu (wxWindow* p)
: _menu (new wxMenu)
- , _film (f)
, _parent (p)
{
_repeat = _menu->Append (ID_repeat, _("Repeat..."));
@@ -66,8 +65,9 @@ ContentMenu::~ContentMenu ()
}
void
-ContentMenu::popup (ContentList c, wxPoint p)
+ContentMenu::popup (weak_ptr<Film> f, ContentList c, wxPoint p)
{
+ _film = f;
_content = c;
_repeat->Enable (!_content.empty ());