diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-12-28 15:09:30 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-12-28 15:09:30 +0000 |
| commit | 521c09170d9e62cd72cc2da66c41816761008a4b (patch) | |
| tree | 267f5cb83ba72a1d489f32ba3c94d5ac02579a4e /src/wx | |
| parent | 0987c41ac468fd93bbb444093e66d5d6753cb927 (diff) | |
| parent | af3e8ed8382cdc35e361cdca1f735a379fce1317 (diff) | |
Merge 1.0
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/content_menu.cc | 2 | ||||
| -rw-r--r-- | src/wx/film_editor.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc index 254109eb3..6372503d1 100644 --- a/src/wx/content_menu.cc +++ b/src/wx/content_menu.cc @@ -80,7 +80,7 @@ ContentMenu::popup (ContentList c, wxPoint p) _join->Enable (n > 1); - _find_missing->Enable (_content.size() == 1 && !_content.front()->path_valid ()); + _find_missing->Enable (_content.size() == 1 && !_content.front()->paths_valid ()); _remove->Enable (!_content.empty ()); _parent->PopupMenu (_menu, p); } diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index 1b3903929..1818fb451 100644 --- a/src/wx/film_editor.cc +++ b/src/wx/film_editor.cc @@ -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) { |