projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use libdcp's warnings.h
[dcpomatic.git]
/
src
/
wx
/
kdm_dialog.cc
diff --git
a/src/wx/kdm_dialog.cc
b/src/wx/kdm_dialog.cc
index c44321ac55c0a931b21b633e6a5894adc9b1f19f..268573e6c35e5048699961279b59c87f806ee022 100644
(file)
--- a/
src/wx/kdm_dialog.cc
+++ b/
src/wx/kdm_dialog.cc
@@
-19,38
+19,39
@@
*/
*/
+#include "confirm_kdm_email_dialog.h"
+#include "dcpomatic_button.h"
+#include "kdm_cpl_panel.h"
#include "kdm_dialog.h"
#include "kdm_dialog.h"
-#include "wx_util.h"
-#include "screens_panel.h"
-#include "kdm_timing_panel.h"
#include "kdm_output_panel.h"
#include "kdm_output_panel.h"
-#include "kdm_
cpl
_panel.h"
-#include "
confirm_kdm_email_dialog
.h"
+#include "kdm_
timing
_panel.h"
+#include "
screens_panel
.h"
#include "static_text.h"
#include "static_text.h"
-#include "dcpomatic_button.h"
+#include "wx_util.h"
+#include "lib/cinema.h"
+#include "lib/config.h"
#include "lib/film.h"
#include "lib/film.h"
-#include "lib/screen.h"
-#include "lib/kdm_with_metadata.h"
#include "lib/job_manager.h"
#include "lib/job_manager.h"
-#include "lib/
config
.h"
-#include "lib/
cinema
.h"
+#include "lib/
kdm_with_metadata
.h"
+#include "lib/
screen
.h"
#include <libcxml/cxml.h>
#include <dcp/exceptions.h>
#include <libcxml/cxml.h>
#include <dcp/exceptions.h>
-#include <wx/treectrl.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/listctrl.h>
#include <wx/listctrl.h>
-#include <iostream>
+#include <wx/treectrl.h>
+LIBDCP_ENABLE_WARNINGS
-using std::string;
using std::exception;
using std::exception;
-using std::map;
using std::list;
using std::list;
-using std::pair;
-using std::cout;
-using std::vector;
using std::make_pair;
using std::make_pair;
+using std::map;
+using std::pair;
using std::runtime_error;
using std::shared_ptr;
using std::runtime_error;
using std::shared_ptr;
+using std::string;
+using std::vector;
using boost::bind;
using boost::optional;
#if BOOST_VERSION >= 106100
using boost::bind;
using boost::optional;
#if BOOST_VERSION >= 106100
@@
-108,7
+109,7
@@
KDMDialog::KDMDialog (wxWindow* parent, shared_ptr<const Film> film)
h = new StaticText (this, _("Output"));
h->SetFont (subheading_font);
right->Add (h, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP * 2);
h = new StaticText (this, _("Output"));
h->SetFont (subheading_font);
right->Add (h, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP * 2);
- _output = new KDMOutputPanel (this
, film->interop ()
);
+ _output = new KDMOutputPanel (this);
right->Add (_output, 0, wxEXPAND | wxTOP, DCPOMATIC_SIZER_GAP);
_make = new Button (this, _("Make KDMs"));
right->Add (_output, 0, wxEXPAND | wxTOP, DCPOMATIC_SIZER_GAP);
_make = new Button (this, _("Make KDMs"));