X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_panel.cc;h=8f09949199ceafce2ac1b532a951c03da099fb03;hb=7d3b018675efdb8b1a4eeaf05c73f997977cb2e9;hp=56a342bfe4c45e9f9dd7b4fe0b8781d3a7ec28dd;hpb=82546514c89c650acd2f52091685403e2a092bc5;p=dcpomatic.git

diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index 56a342bfe..8f0994919 100644
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -45,15 +45,16 @@
 #include "lib/string_text_file_content.h"
 #include "lib/text_content.h"
 #include "lib/video_content.h"
-#include <wx/wx.h>
-#include <wx/notebook.h>
-#include <wx/listctrl.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/display.h>
+#include <wx/listctrl.h>
+#include <wx/notebook.h>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
-#include <iostream>
 
 
-using std::cout;
 using std::dynamic_pointer_cast;
 using std::exception;
 using std::list;
@@ -84,7 +85,7 @@ ContentPanel::ContentPanel (wxNotebook* n, shared_ptr<Film> film, weak_ptr<FilmV
 	_splitter = new LimitedSplitter (n);
 	_top_panel = new wxPanel (_splitter);
 
-	_menu = new ContentMenu (_splitter);
+	_menu = new ContentMenu (_splitter, _film_viewer);
 
 	{
 		auto s = new wxBoxSizer (wxHORIZONTAL);