projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tweak quality.
[dcpomatic.git]
/
src
/
wx
/
content_panel.cc
diff --git
a/src/wx/content_panel.cc
b/src/wx/content_panel.cc
index 56a342bfe4c45e9f9dd7b4fe0b8781d3a7ec28dd..8f09949199ceafce2ac1b532a951c03da099fb03 100644
(file)
--- 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 "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/display.h>
+#include <wx/listctrl.h>
+#include <wx/notebook.h>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
#include <boost/filesystem.hpp>
#include <boost/filesystem.hpp>
-#include <iostream>
-using std::cout;
using std::dynamic_pointer_cast;
using std::exception;
using std::list;
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);
_splitter = new LimitedSplitter (n);
_top_panel = new wxPanel (_splitter);
- _menu = new ContentMenu (_splitter);
+ _menu = new ContentMenu (_splitter
, _film_viewer
);
{
auto s = new wxBoxSizer (wxHORIZONTAL);
{
auto s = new wxBoxSizer (wxHORIZONTAL);