X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_sub_panel.cc;h=0c775287ac69ab2ec5cd8e9b03c6033a4866ccfe;hb=b9a1ad3df5f9d85fb7439efd93fede72b9b078af;hp=9c236abebfef4a1b552b5e8b5f084a283f569a1d;hpb=8ccbe70f3c2f5db9e88978a98f3ad5735ece07ab;p=dcpomatic.git diff --git a/src/wx/content_sub_panel.cc b/src/wx/content_sub_panel.cc index 9c236abeb..0c775287a 100644 --- a/src/wx/content_sub_panel.cc +++ b/src/wx/content_sub_panel.cc @@ -18,21 +18,27 @@ */ + #include "content_sub_panel.h" #include "content_panel.h" #include "wx_util.h" #include "lib/dcp_content.h" #include "lib/compose.hpp" #include "lib/log.h" +#include "lib/warnings.h" +DCPOMATIC_DISABLE_WARNINGS #include +DCPOMATIC_ENABLE_WARNINGS + using std::list; -using std::string; using std::shared_ptr; +using std::string; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; #endif + ContentSubPanel::ContentSubPanel (ContentPanel* p, wxString name) : wxScrolledWindow (p->notebook(), wxID_ANY) , _parent (p)