diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-12-29 19:30:59 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-12-29 19:30:59 +0000 |
| commit | b8fb440b93ff5ee835249204bd5642cf95a4ac99 (patch) | |
| tree | 5435fc683da85716ed4ce74b9f2f3cbce0f2753b /src/wx/timeline.cc | |
| parent | 521c09170d9e62cd72cc2da66c41816761008a4b (diff) | |
| parent | ea366080377aae73e7b6720729d3fd1c523e4c48 (diff) | |
Merge branch '1.0' into 1.0-seek
Diffstat (limited to 'src/wx/timeline.cc')
| -rw-r--r-- | src/wx/timeline.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc index 9d2aee76c..2119e7813 100644 --- a/src/wx/timeline.cc +++ b/src/wx/timeline.cc @@ -336,7 +336,7 @@ DCPTimeline::DCPTimeline (wxWindow* parent, FilmEditor* ed, shared_ptr<Film> fil , _left_down (false) , _down_view_position (0) , _first_move (false) - , _menu (film, this) + , _menu (this) , _snap (true) { #ifndef __WXOSX__ @@ -574,7 +574,7 @@ DCPTimeline::right_down (wxMouseEvent& ev) cv->set_selected (true); } - _menu.popup (selected_content (), ev.GetPosition ()); + _menu.popup (_film, selected_content (), ev.GetPosition ()); } void |