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
/
film_editor.cc
diff --git
a/src/wx/film_editor.cc
b/src/wx/film_editor.cc
index 04bf6d2a809c10334b4a2b13b165d67fe6d52e2b..dd3ec6b6770516133c81d9476026852895bb6373 100644
(file)
--- a/
src/wx/film_editor.cc
+++ b/
src/wx/film_editor.cc
@@
-72,7
+72,7
@@
using boost::lexical_cast;
/** @param f Film to edit */
FilmEditor::FilmEditor (shared_ptr<Film> f, wxWindow* parent)
: wxPanel (parent)
/** @param f Film to edit */
FilmEditor::FilmEditor (shared_ptr<Film> f, wxWindow* parent)
: wxPanel (parent)
- , _menu (
f,
this)
+ , _menu (this)
, _generally_sensitive (true)
, _timeline_dialog (0)
{
, _generally_sensitive (true)
, _timeline_dialog (0)
{
@@
-966,7
+966,7
@@
FilmEditor::sequence_video_changed ()
void
FilmEditor::content_right_click (wxListEvent& ev)
{
void
FilmEditor::content_right_click (wxListEvent& ev)
{
- _menu.popup (selected_content (), ev.GetPoint ());
+ _menu.popup (
_film,
selected_content (), ev.GetPoint ());
}
void
}
void