projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix (I think) some strange situations where ::get() on dialogs
[dcpomatic.git]
/
src
/
wx
/
dkdm_dialog.cc
diff --git
a/src/wx/dkdm_dialog.cc
b/src/wx/dkdm_dialog.cc
index 68fe4bae1ae53ebfc594702c6d68aa9605993b5f..c7503048cea80331645afb15808949ca1a1316a0 100644
(file)
--- 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 "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 "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 "static_text.h"
-#include "dcpomatic_button.h"
+#include "wx_util.h"
+#include "lib/config.h"
#include "lib/film.h"
#include "lib/film.h"
-#include "lib/kdm_with_metadata.h"
#include "lib/job_manager.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 <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