using std::string;
using std::list;
using boost::shared_ptr;
+using boost::weak_ptr;
using boost::optional;
-FilmEditor::FilmEditor (wxWindow* parent, ControlFilmViewer* viewer)
+FilmEditor::FilmEditor (wxWindow* parent, weak_ptr<FilmViewer> viewer)
: wxPanel (parent)
{
wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
s->Add (_main_notebook, 1);
_content_panel = new ContentPanel (_main_notebook, _film, viewer);
- _main_notebook->AddPage (_content_panel->panel (), _("Content"), true);
+ _main_notebook->AddPage (_content_panel->window(), _("Content"), true);
_dcp_panel = new DCPPanel (_main_notebook, _film);
_main_notebook->AddPage (_dcp_panel->panel (), _("DCP"), false);