X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fdkdm_dialog.cc;h=6a4913d8655e65c937e86abfa00d6caf0ee53742;hp=68fe4bae1ae53ebfc594702c6d68aa9605993b5f;hb=6ebec6b3ca11a7062ae19176096b1b157275d015;hpb=39fb8198febde1937019db1c300ec363aab5aa56

diff --git a/src/wx/dkdm_dialog.cc b/src/wx/dkdm_dialog.cc
index 68fe4bae1..6a4913d86 100644
--- a/src/wx/dkdm_dialog.cc
+++ b/src/wx/dkdm_dialog.cc
@@ -19,36 +19,37 @@
 */
 
 
+#include "confirm_kdm_email_dialog.h"
+#include "dcpomatic_button.h"
 #include "dkdm_dialog.h"
-#include "wx_util.h"
-#include "recipients_panel.h"
-#include "kdm_timing_panel.h"
 #include "dkdm_output_panel.h"
 #include "kdm_cpl_panel.h"
-#include "confirm_kdm_email_dialog.h"
+#include "kdm_timing_panel.h"
+#include "recipients_panel.h"
 #include "static_text.h"
-#include "dcpomatic_button.h"
+#include "wx_util.h"
+#include "lib/config.h"
 #include "lib/film.h"
-#include "lib/kdm_with_metadata.h"
 #include "lib/job_manager.h"
-#include "lib/config.h"
+#include "lib/kdm_with_metadata.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 <iostream>
+#include <wx/treectrl.h>
+LIBDCP_ENABLE_WARNINGS
 
 
-using std::string;
 using std::exception;
-using std::map;
 using std::list;
-using std::pair;
-using std::cout;
-using std::vector;
 using std::make_pair;
+using std::map;
+using std::pair;
 using std::runtime_error;
 using std::shared_ptr;
+using std::string;
+using std::vector;
 using boost::bind;
 using boost::optional;
 #if BOOST_VERSION >= 106100
@@ -105,7 +106,7 @@ DKDMDialog::DKDMDialog (wxWindow* parent, shared_ptr<const Film> film)
 	/* Sub-heading: Output */
 	h = new StaticText (this, _("Output"));
 	h->SetFont (subheading_font);
-	right->Add (h, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP * 2);
+	right->Add(h, 0, wxTOP, DCPOMATIC_SUBHEADING_TOP_PAD);
 	_output = new DKDMOutputPanel (this);
 	right->Add (_output, 0, wxEXPAND | wxTOP, DCPOMATIC_SIZER_GAP);
 
@@ -168,7 +169,7 @@ DKDMDialog::make_clicked ()
 		if (e.starts_too_early()) {
 			error_dialog (this, _("The KDM start period is before (or close to) the start of the signing certificate's validity period.  Use a later start time for this KDM."));
 		} else {
-			error_dialog (this, _("The KDM end period is after (or close to) the end of the signing certficates' validity period.  Either use an earlier end time for this KDM or re-create your signing certificates in the DCP-o-matic preferences window."));
+			error_dialog (this, _("The KDM end period is after (or close to) the end of the signing certificates' validity period.  Either use an earlier end time for this KDM or re-create your signing certificates in the DCP-o-matic preferences window."));
 		}
 		return;
 	} catch (runtime_error& e) {