diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-08-25 16:56:17 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-08-25 16:56:17 +0100 |
| commit | 7b2054e2a73844450b5b55c5788c02af671812ce (patch) | |
| tree | 5d5727a5bce89cdd32923c0c44841abd0585c8cb /src/wx/film_editor.cc | |
| parent | c497e601934e82425efef5dc981b12818a881990 (diff) | |
| parent | 7edf8e601ed2ede5b6758840fb9d8940393cf7e2 (diff) | |
Merge master.
Diffstat (limited to 'src/wx/film_editor.cc')
| -rw-r--r-- | src/wx/film_editor.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index 1ce4695d6..7f9461d94 100644 --- a/src/wx/film_editor.cc +++ b/src/wx/film_editor.cc @@ -71,7 +71,7 @@ using boost::dynamic_pointer_cast; using boost::lexical_cast; /** @param f Film to edit */ -FilmEditor::FilmEditor (shared_ptr<Film> f, wxWindow* parent) +FilmEditor::FilmEditor (wxWindow* parent) : wxPanel (parent) { wxBoxSizer* s = new wxBoxSizer (wxVERTICAL); @@ -84,12 +84,12 @@ FilmEditor::FilmEditor (shared_ptr<Film> f, wxWindow* parent) _dcp_panel = new DCPPanel (_main_notebook, _film); _main_notebook->AddPage (_dcp_panel->panel (), _("DCP"), false); - set_film (f); - JobManager::instance()->ActiveJobsChanged.connect ( bind (&FilmEditor::active_jobs_changed, this, _1) ); + set_film (shared_ptr<Film> ()); + SetSizerAndFit (s); } |