BOOST_FOREACH.

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

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index a017175f522106d4663f1b98d37087d9e2304d19..bb40dad9f3693eccf70a944bdcaba8dfc4d87853 100644 (file)
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -32,15 +32,17 @@
 #include "lib/dcp_content.h"
 #include <wx/wx.h>
 #include <wx/notebook.h>
-#include <boost/foreach.hpp>
 #include <iostream>
 
 using std::cout;
 using std::string;
 using std::list;
-using boost::shared_ptr;
-using boost::weak_ptr;
+using std::shared_ptr;
+using std::weak_ptr;
 using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 FilmEditor::FilmEditor (wxWindow* parent, weak_ptr<FilmViewer> viewer)
        : wxPanel (parent)
@@ -52,7 +54,7 @@ FilmEditor::FilmEditor (wxWindow* parent, weak_ptr<FilmViewer> viewer)
 
        _content_panel = new ContentPanel (_main_notebook, _film, viewer);
        _main_notebook->AddPage (_content_panel->window(), _("Content"), true);
-       _dcp_panel = new DCPPanel (_main_notebook, _film);
+       _dcp_panel = new DCPPanel (_main_notebook, _film, viewer);
        _main_notebook->AddPage (_dcp_panel->panel (), _("DCP"), false);
 
        JobManager::instance()->ActiveJobsChanged.connect (
@@ -156,3 +158,11 @@ FilmEditor::active_jobs_changed (optional<string> j)
 {
        set_general_sensitivity (!j);
 }
+
+
+void
+FilmEditor::first_shown ()
+{
+       _content_panel->first_shown ();
+}
+