C++11 tidying.

[dcpomatic.git] / src / wx / film_name_location_dialog.cc

diff --git a/src/wx/film_name_location_dialog.cc b/src/wx/film_name_location_dialog.cc
index 516ed86ae9cbf0fbc3e6ba960b797b31a141994d..2f3fefe49aa0c2033fc2903e4e4c1092d2bef9fe 100644 (file)
--- a/src/wx/film_name_location_dialog.cc
+++ b/src/wx/film_name_location_dialog.cc
@@ -22,12 +22,16 @@
 #include "check_box.h"
 #include "film_name_location_dialog.h"
 #include "wx_util.h"
+/* This must come after wx_util.h as it defines DCPOMATIC_USE_OWN_PICKER */
 #ifdef DCPOMATIC_USE_OWN_PICKER
 #include "dir_picker_ctrl.h"
 #endif
-#include "lib/config.h"
 #include "lib/compose.hpp"
+#include "lib/config.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/stdpaths.h>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>