Merge 1.0

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

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 728098b934ab331e3c10956f8abc22c973df9c90..1818fb451452233c196c534a7f996827d7a3b27d 100644 (file)
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -284,7 +284,7 @@ FilmEditor::make_content_panel ()
 
                s->Add (b, 0, wxALL, 4);
 
-               _content_sizer->Add (s, 0.75, wxEXPAND | wxALL, 6);
+               _content_sizer->Add (s, 1, wxEXPAND | wxALL, 6);
        }
 
        _sequence_video = new wxCheckBox (_content_panel, wxID_ANY, _("Keep video in sequence"));
@@ -734,7 +734,7 @@ FilmEditor::setup_content ()
        ContentList content = _film->content ();
        for (ContentList::iterator i = content.begin(); i != content.end(); ++i) {
                int const t = _content->GetItemCount ();
-               bool const valid = (*i)->path_valid ();
+               bool const valid = (*i)->paths_valid ();
 
                string s = (*i)->summary ();
                if (!valid) {