projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix Windows build.
[dcpomatic.git]
/
src
/
wx
/
dkdm_output_panel.cc
diff --git
a/src/wx/dkdm_output_panel.cc
b/src/wx/dkdm_output_panel.cc
index 5b04f740a4a2ab3db6acf7bb70f32e9454c60cc9..cc02721ed15d9ec7f08a905ee414410de40fd7d7 100644
(file)
--- a/
src/wx/dkdm_output_panel.cc
+++ b/
src/wx/dkdm_output_panel.cc
@@
-31,15
+31,19
@@
#include <dcp/exceptions.h>
#include <dcp/types.h>
#include <dcp/warnings.h>
#include <dcp/exceptions.h>
#include <dcp/types.h>
#include <dcp/warnings.h>
+
#ifdef DCPOMATIC_USE_OWN_PICKER
#include "dir_picker_ctrl.h"
#else
LIBDCP_DISABLE_WARNINGS
#include <wx/filepicker.h>
#ifdef DCPOMATIC_USE_OWN_PICKER
#include "dir_picker_ctrl.h"
#else
LIBDCP_DISABLE_WARNINGS
#include <wx/filepicker.h>
-#include <wx/stdpaths.h>
LIBDCP_ENABLE_WARNINGS
#endif
LIBDCP_ENABLE_WARNINGS
#endif
+LIBDCP_DISABLE_WARNINGS
+#include <wx/stdpaths.h>
+LIBDCP_ENABLE_WARNINGS
+
using std::exception;
using std::function;
using std::exception;
using std::function;