Cleanup: use layout() wrapper.

[dcpomatic.git] / src / wx / film_editor.cc

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 47fb469707fdeab4255663ba199209f631864d52..e602f9333ca40bb9b65fd0aff1d9bbdac9038e5d 100644 (file)
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -49,18 +49,18 @@ using namespace boost::placeholders;
 #endif
 
 
-FilmEditor::FilmEditor (wxWindow* parent, weak_ptr<FilmViewer> viewer)
+FilmEditor::FilmEditor(wxWindow* parent, FilmViewer& viewer)
        : wxPanel (parent)
 {
        auto s = new wxBoxSizer (wxVERTICAL);
 
-       _main_notebook = new wxNotebook (this, wxID_ANY);
-       s->Add (_main_notebook, 1);
+       auto notebook = new wxNotebook(this, wxID_ANY);
+       s->Add(notebook, 1, wxEXPAND);
 
-       _content_panel = new ContentPanel (_main_notebook, _film, viewer);
-       _main_notebook->AddPage (_content_panel->window(), _("Content"), true);
-       _dcp_panel = new DCPPanel (_main_notebook, _film, viewer);
-       _main_notebook->AddPage (_dcp_panel->panel (), _("DCP"), false);
+       _content_panel = new ContentPanel(notebook, _film, viewer);
+       notebook->AddPage(_content_panel->window(), _("Content"), true);
+       _dcp_panel = new DCPPanel(notebook, _film, viewer);
+       notebook->AddPage(_dcp_panel->panel (), _("DCP"), false);
 
        JobManager::instance()->ActiveJobsChanged.connect (
                bind(&FilmEditor::active_jobs_changed, this, _2)
@@ -135,19 +135,12 @@ FilmEditor::set_film (shared_ptr<Film> film)
        _dcp_panel->set_film (_film);
 
        if (!_film) {
-               FileChanged ("");
                return;
        }
 
        _film->Change.connect (bind(&FilmEditor::film_change, this, _1, _2));
        _film->ContentChange.connect (bind(&FilmEditor::film_content_change, this, _1, _3));
 
-       if (_film->directory()) {
-               FileChanged (_film->directory().get());
-       } else {
-               FileChanged ("");
-       }
-
        if (!_film->content().empty()) {
                _content_panel->set_selection (_film->content().front());
        }