Hide warnings triggered by Ubuntu 20.04's gcc.

73 files changed, 234 insertions, 11 deletions

diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index 4f58b2d18..b3e68f4d1 100644
--- a/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@ -27,8 +27,11 @@
 #include "static_text.h"
 #include "lib/version.h"
 #include "lib/compose.hpp"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/notebook.h>
 #include <wx/hyperlink.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 using std::vector;
 
diff --git a/src/wx/about_dialog.h b/src/wx/about_dialog.h
index c19654599..f3bb65a6c 100644
--- a/src/wx/about_dialog.h
+++ b/src/wx/about_dialog.h
@@ -22,7 +22,10 @@
  *  @brief The "about DCP-o-matic" dialogue box.
  */
 
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 class wxNotebook;
 
diff --git a/src/wx/audio_dialog.h b/src/wx/audio_dialog.h
index 93c33152a..e5625d415 100644
--- a/src/wx/audio_dialog.h
+++ b/src/wx/audio_dialog.h
@@ -21,7 +21,10 @@
 #include "lib/film.h"
 #include "lib/audio_analysis.h"
 #include "lib/playlist.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
 
diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc
index 9e3ff787d..e1c96fdeb 100644
--- a/src/wx/audio_mapping_view.cc
+++ b/src/wx/audio_mapping_view.cc
@@ -27,12 +27,15 @@
 #include "audio_gain_dialog.h"
 #include "lib/audio_mapping.h"
 #include "lib/util.h"
+#include "lib/warnings.h"
 #include <dcp/locale_convert.h>
 #include <dcp/types.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 #include <wx/renderer.h>
 #include <wx/grid.h>
 #include <wx/graphics.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/foreach.hpp>
 #include <iostream>
 
diff --git a/src/wx/audio_mapping_view.h b/src/wx/audio_mapping_view.h
index 3057416b2..e20e5289b 100644
--- a/src/wx/audio_mapping_view.h
+++ b/src/wx/audio_mapping_view.h
@@ -23,9 +23,12 @@
  *
  */
 
-#include <boost/signals2.hpp>
-#include <wx/wx.h>
 #include "lib/audio_mapping.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
+#include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
+#include <boost/signals2.hpp>
 
 /** @class AudioMappingView
  *  @brief This class displays the mapping of one set of audio channels to another,
diff --git a/src/wx/audio_plot.h b/src/wx/audio_plot.h
index 6eb853dce..989f15edc 100644
--- a/src/wx/audio_plot.h
+++ b/src/wx/audio_plot.h
@@ -20,7 +20,10 @@
 
 #include "lib/util.h"
 #include "lib/audio_analysis.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
 #include <vector>
diff --git a/src/wx/closed_captions_dialog.h b/src/wx/closed_captions_dialog.h
index 5c366ca7b..cfdab5f3c 100644
--- a/src/wx/closed_captions_dialog.h
+++ b/src/wx/closed_captions_dialog.h
@@ -21,7 +21,10 @@
 #include "lib/dcpomatic_time.h"
 #include "lib/player.h"
 #include "lib/text_ring_buffers.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 class Butler;
 class FilmViewer;
diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h
index f47408a4f..afbe9ed2e 100644
--- a/src/wx/config_dialog.h
+++ b/src/wx/config_dialog.h
@@ -32,13 +32,16 @@
 #include "lib/util.h"
 #include "lib/cross.h"
 #include "lib/exceptions.h"
+#include "lib/warnings.h"
 #include <dcp/locale_convert.h>
 #include <dcp/exceptions.h>
 #include <dcp/certificate_chain.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/stdpaths.h>
 #include <wx/preferences.h>
 #include <wx/spinctrl.h>
 #include <wx/filepicker.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <RtAudio.h>
 #include <boost/filesystem.hpp>
 #include <boost/foreach.hpp>
diff --git a/src/wx/content_advanced_dialog.h b/src/wx/content_advanced_dialog.h
index ba5d0c6fd..b8c12d7b2 100644
--- a/src/wx/content_advanced_dialog.h
+++ b/src/wx/content_advanced_dialog.h
@@ -19,7 +19,10 @@
 */
 
 
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/shared_ptr.hpp>
 #include <vector>
 
diff --git a/src/wx/content_sub_panel.h b/src/wx/content_sub_panel.h
index d5f502eea..128a3862d 100644
--- a/src/wx/content_sub_panel.h
+++ b/src/wx/content_sub_panel.h
@@ -21,10 +21,13 @@
 #ifndef DCPOMATIC_CONTENT_SUB_PANEL_H
 #define DCPOMATIC_CONTENT_SUB_PANEL_H
 
-#include <boost/shared_ptr.hpp>
-#include <wx/wx.h>
 #include "lib/film.h"
 #include "lib/config.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
+#include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
+#include <boost/shared_ptr.hpp>
 
 class ContentPanel;
 class Content;
diff --git a/src/wx/content_view.h b/src/wx/content_view.h
index 334e9bb68..3f4a65ab1 100644
--- a/src/wx/content_view.h
+++ b/src/wx/content_view.h
@@ -19,7 +19,10 @@
 */
 
 #include "lib/content_store.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/listctrl.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 #include <vector>
diff --git a/src/wx/controls.h b/src/wx/controls.h
index b9c4604b6..1d6273af6 100644
--- a/src/wx/controls.h
+++ b/src/wx/controls.h
@@ -24,7 +24,10 @@
 #include "lib/dcpomatic_time.h"
 #include "lib/types.h"
 #include "lib/film.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
 
diff --git a/src/wx/custom_scale_dialog.cc b/src/wx/custom_scale_dialog.cc
index 3452d5765..bb8be8e80 100644
--- a/src/wx/custom_scale_dialog.cc
+++ b/src/wx/custom_scale_dialog.cc
@@ -23,9 +23,12 @@
 #include "wx_util.h"
 #include "lib/util.h"
 #include <dcp/raw_convert.h>
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 #include <wx/propgrid/property.h>
 #include <wx/propgrid/props.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using boost::optional;
diff --git a/src/wx/custom_scale_dialog.h b/src/wx/custom_scale_dialog.h
index 4c9ccf388..485b6acf5 100644
--- a/src/wx/custom_scale_dialog.h
+++ b/src/wx/custom_scale_dialog.h
@@ -19,10 +19,13 @@
 */
 
 
+#include "lib/warnings.h"
 #include "table_dialog.h"
 #include <dcp/types.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 #include <wx/spinctrl.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 class CustomScaleDialog : public TableDialog
diff --git a/src/wx/dir_picker_ctrl.cc b/src/wx/dir_picker_ctrl.cc
index b05e73273..289316820 100644
--- a/src/wx/dir_picker_ctrl.cc
+++ b/src/wx/dir_picker_ctrl.cc
@@ -22,9 +22,12 @@
 #include "wx_util.h"
 #include "static_text.h"
 #include "dcpomatic_button.h"
+#include "lib/warnings.h"
 #include <wx/wx.h>
 #include <wx/stdpaths.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/filepicker.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 
 using namespace std;
diff --git a/src/wx/disk_warning_dialog.h b/src/wx/disk_warning_dialog.h
index 869092faa..c690ea25d 100644
--- a/src/wx/disk_warning_dialog.h
+++ b/src/wx/disk_warning_dialog.h
@@ -18,7 +18,10 @@
 
 */
 
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 class DiskWarningDialog : public wxDialog
 {
diff --git a/src/wx/dkdm_output_panel.cc b/src/wx/dkdm_output_panel.cc
index 3f8730ae3..d8645ff97 100644
--- a/src/wx/dkdm_output_panel.cc
+++ b/src/wx/dkdm_output_panel.cc
@@ -20,6 +20,7 @@
 
 #include "lib/config.h"
 #include "lib/send_kdm_email_job.h"
+#include "lib/warnings.h"
 #include "dkdm_output_panel.h"
 #include "kdm_timing_panel.h"
 #include "confirm_kdm_email_dialog.h"
@@ -32,7 +33,9 @@
 #ifdef DCPOMATIC_USE_OWN_PICKER
 #include "dir_picker_ctrl.h"
 #else
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/filepicker.h>
+DCPOMATIC_ENABLE_WARNINGS
 #endif
 #include <wx/stdpaths.h>
 
diff --git a/src/wx/download_certificate_dialog.h b/src/wx/download_certificate_dialog.h
index a2fbf808f..ef241a0ca 100644
--- a/src/wx/download_certificate_dialog.h
+++ b/src/wx/download_certificate_dialog.h
@@ -18,9 +18,12 @@
 
 */
 
+#include "lib/warnings.h"
 #include <dcp/certificate.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 #include <wx/notebook.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 class DownloadCertificatePanel;
 
diff --git a/src/wx/export_dialog.cc b/src/wx/export_dialog.cc
index ce6e1e2e9..fa627cd81 100644
--- a/src/wx/export_dialog.cc
+++ b/src/wx/export_dialog.cc
@@ -22,7 +22,10 @@
 #include "file_picker_ctrl.h"
 #include "wx_util.h"
 #include "check_box.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/filepicker.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/bind.hpp>
 
 using std::string;
diff --git a/src/wx/file_picker_ctrl.cc b/src/wx/file_picker_ctrl.cc
index 47211a269..3eb05e44d 100644
--- a/src/wx/file_picker_ctrl.cc
+++ b/src/wx/file_picker_ctrl.cc
@@ -21,9 +21,12 @@
 #include "file_picker_ctrl.h"
 #include "wx_util.h"
 #include "dcpomatic_button.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 #include <wx/stdpaths.h>
 #include <wx/filepicker.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 
 using namespace std;
diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index b8d862f81..84a1d361b 100644
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -23,7 +23,10 @@
  */
 
 #include "lib/film.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 class wxNotebook;
diff --git a/src/wx/film_name_location_dialog.h b/src/wx/film_name_location_dialog.h
index cfa296701..f2f082680 100644
--- a/src/wx/film_name_location_dialog.h
+++ b/src/wx/film_name_location_dialog.h
@@ -18,10 +18,13 @@
 
 */
 
-#include <wx/wx.h>
-#include <wx/filepicker.h>
 #include "wx_util.h"
 #include "table_dialog.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
+#include <wx/wx.h>
+#include <wx/filepicker.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 class DirPickerCtrl;
 
diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 29985a581..6e995813c 100644
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -28,8 +28,11 @@
 #include "lib/player_text.h"
 #include "lib/timer.h"
 #include "lib/signaller.h"
+#include "lib/warnings.h"
 #include <RtAudio.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 class wxToggleButton;
 class FFmpegPlayer;
diff --git a/src/wx/filter_dialog.h b/src/wx/filter_dialog.h
index 3ba4a09f5..775995f38 100644
--- a/src/wx/filter_dialog.h
+++ b/src/wx/filter_dialog.h
@@ -22,7 +22,10 @@
  *  @brief A dialog to select FFmpeg filters.
  */
 
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 class Film;
diff --git a/src/wx/focus_manager.cc b/src/wx/focus_manager.cc
index f4f23cb28..e10075f3a 100644
--- a/src/wx/focus_manager.cc
+++ b/src/wx/focus_manager.cc
@@ -19,7 +19,10 @@
 */
 
 #include "focus_manager.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/textctrl.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 FocusManager* FocusManager::_instance;
 
diff --git a/src/wx/fonts_dialog.h b/src/wx/fonts_dialog.h
index ba98e0963..260e74c3d 100644
--- a/src/wx/fonts_dialog.h
+++ b/src/wx/fonts_dialog.h
@@ -18,8 +18,11 @@
 
 */
 
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/listctrl.h>
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 #include <boost/filesystem.hpp>
diff --git a/src/wx/gl_video_view.h b/src/wx/gl_video_view.h
index 3675b8ddc..fcf5dbcf2 100644
--- a/src/wx/gl_video_view.h
+++ b/src/wx/gl_video_view.h
@@ -21,8 +21,11 @@
 #include "video_view.h"
 #include "lib/signaller.h"
 #include "lib/position.h"
-#include <wx/wx.h>
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/glcanvas.h>
+#include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <dcp/util.h>
 #include <boost/atomic.hpp>
 #include <boost/shared_ptr.hpp>
diff --git a/src/wx/hints_dialog.cc b/src/wx/hints_dialog.cc
index cb0de450a..c98cbae07 100644
--- a/src/wx/hints_dialog.cc
+++ b/src/wx/hints_dialog.cc
@@ -25,7 +25,10 @@
 #include "lib/film.h"
 #include "lib/hints.h"
 #include "lib/config.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/richtext/richtextctrl.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/foreach.hpp>
 
 using std::max;
diff --git a/src/wx/hints_dialog.h b/src/wx/hints_dialog.h
index 1fac9d11e..87dcf1953 100644
--- a/src/wx/hints_dialog.h
+++ b/src/wx/hints_dialog.h
@@ -19,7 +19,10 @@
 */
 
 #include "lib/types.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/weak_ptr.hpp>
 #include <boost/signals2.hpp>
 
diff --git a/src/wx/html_dialog.cc b/src/wx/html_dialog.cc
index b5f86e7a1..873aa718c 100644
--- a/src/wx/html_dialog.cc
+++ b/src/wx/html_dialog.cc
@@ -21,9 +21,12 @@
 #include "html_dialog.h"
 #include "wx_util.h"
 #include "lib/cross.h"
+#include "lib/warnings.h"
 #include <boost/filesystem.hpp>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wxhtml.h>
 #include <wx/fs_mem.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <iostream>
 
 HTMLDialog::HTMLDialog (wxWindow* parent, wxString title, wxString html)
diff --git a/src/wx/html_dialog.h b/src/wx/html_dialog.h
index f5fc76e4f..9da4c8215 100644
--- a/src/wx/html_dialog.h
+++ b/src/wx/html_dialog.h
@@ -18,7 +18,10 @@
 
 */
 
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 class wxHtmlLinkEvent;
 
diff --git a/src/wx/initial_setup_dialog.h b/src/wx/initial_setup_dialog.h
index 3dfdbe2b0..2198fb426 100644
--- a/src/wx/initial_setup_dialog.h
+++ b/src/wx/initial_setup_dialog.h
@@ -18,7 +18,10 @@
 
 */
 
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 class InitialSetupDialog : public wxDialog
 {
diff --git a/src/wx/instant_i18n_dialog.h b/src/wx/instant_i18n_dialog.h
index f9fe96d6a..418a1145d 100644
--- a/src/wx/instant_i18n_dialog.h
+++ b/src/wx/instant_i18n_dialog.h
@@ -18,7 +18,10 @@
 
 */
 
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 class InstantI18NDialog : public wxDialog
 {
diff --git a/src/wx/job_manager_view.h b/src/wx/job_manager_view.h
index 77114a97c..2e471532f 100644
--- a/src/wx/job_manager_view.h
+++ b/src/wx/job_manager_view.h
@@ -22,7 +22,10 @@
  *  @brief Class which is a wxPanel for showing the progress of jobs.
  */
 
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/shared_ptr.hpp>
 #include <list>
 
diff --git a/src/wx/kdm_cpl_panel.h b/src/wx/kdm_cpl_panel.h
index 9d6db76c6..4b461b813 100644
--- a/src/wx/kdm_cpl_panel.h
+++ b/src/wx/kdm_cpl_panel.h
@@ -19,8 +19,11 @@
 */
 
 #include "lib/types.h"
+#include "lib/warnings.h"
 #include <boost/filesystem.hpp>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 class KDMCPLPanel : public wxPanel
 {
diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc
index a345d0e96..b138e7d31 100644
--- a/src/wx/kdm_output_panel.cc
+++ b/src/wx/kdm_output_panel.cc
@@ -18,9 +18,6 @@
 
 */
 
-#include "lib/config.h"
-#include "lib/cinema.h"
-#include "lib/send_kdm_email_job.h"
 #include "kdm_output_panel.h"
 #include "kdm_timing_panel.h"
 #include "confirm_kdm_email_dialog.h"
@@ -29,14 +26,22 @@
 #include "name_format_editor.h"
 #include "check_box.h"
 #include "dcpomatic_button.h"
+#include "lib/config.h"
+#include "lib/cinema.h"
+#include "lib/send_kdm_email_job.h"
+#include "lib/warnings.h"
 #include <dcp/exceptions.h>
 #include <dcp/types.h>
 #ifdef DCPOMATIC_USE_OWN_PICKER
 #include "dir_picker_ctrl.h"
 #else
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/filepicker.h>
+DCPOMATIC_ENABLE_WARNINGS
 #endif
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/stdpaths.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 using std::pair;
 using std::string;
diff --git a/src/wx/kdm_timing_panel.cc b/src/wx/kdm_timing_panel.cc
index 51a99627c..2734a9894 100644
--- a/src/wx/kdm_timing_panel.cc
+++ b/src/wx/kdm_timing_panel.cc
@@ -22,8 +22,11 @@
 #include "wx_util.h"
 #include "time_picker.h"
 #include "static_text.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/datectrl.h>
 #include <wx/dateevt.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 using std::cout;
 using boost::bind;
diff --git a/src/wx/kdm_timing_panel.h b/src/wx/kdm_timing_panel.h
index a926864db..be2e9309b 100644
--- a/src/wx/kdm_timing_panel.h
+++ b/src/wx/kdm_timing_panel.h
@@ -18,7 +18,10 @@
 
 */
 
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/signals2.hpp>
 
diff --git a/src/wx/markers_dialog.h b/src/wx/markers_dialog.h
index fbbaa1aee..e2c261873 100644
--- a/src/wx/markers_dialog.h
+++ b/src/wx/markers_dialog.h
@@ -18,7 +18,10 @@
 
 */
 
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 #include <list>
diff --git a/src/wx/nag_dialog.h b/src/wx/nag_dialog.h
index acf20f129..bc5ae6962 100644
--- a/src/wx/nag_dialog.h
+++ b/src/wx/nag_dialog.h
@@ -19,7 +19,10 @@
 */
 
 #include "lib/config.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 class NagDialog : public wxDialog
 {
diff --git a/src/wx/name_format_editor.h b/src/wx/name_format_editor.h
index 2ae3f5e93..32c78ea25 100644
--- a/src/wx/name_format_editor.h
+++ b/src/wx/name_format_editor.h
@@ -22,8 +22,11 @@
 #define DCPOMATIC_NAME_FORMAT_EDITOR_H
 
 #include "lib/compose.hpp"
+#include "lib/warnings.h"
 #include <dcp/name_format.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/foreach.hpp>
 #include <boost/signals2.hpp>
 
diff --git a/src/wx/password_entry.h b/src/wx/password_entry.h
index b7cc93319..5939e5264 100644
--- a/src/wx/password_entry.h
+++ b/src/wx/password_entry.h
@@ -18,7 +18,10 @@
 
 */
 
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 class CheckBox;
diff --git a/src/wx/player_information.h b/src/wx/player_information.h
index b93228174..ae3e13429 100644
--- a/src/wx/player_information.h
+++ b/src/wx/player_information.h
@@ -18,7 +18,10 @@
 
 */
 
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/scoped_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 
diff --git a/src/wx/player_stress_tester.h b/src/wx/player_stress_tester.h
index 9da73762f..c8cc14676 100644
--- a/src/wx/player_stress_tester.h
+++ b/src/wx/player_stress_tester.h
@@ -18,7 +18,10 @@
 
 */
 
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 #include <boost/filesystem.hpp>
 
diff --git a/src/wx/question_dialog.h b/src/wx/question_dialog.h
index a3b05173a..6b99065f6 100644
--- a/src/wx/question_dialog.h
+++ b/src/wx/question_dialog.h
@@ -18,7 +18,10 @@
 
 */
 
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 class QuestionDialog : public wxDialog
 {
diff --git a/src/wx/recipient_dialog.cc b/src/wx/recipient_dialog.cc
index 94d5e3deb..f0bb54708 100644
--- a/src/wx/recipient_dialog.cc
+++ b/src/wx/recipient_dialog.cc
@@ -29,8 +29,11 @@
 #include "lib/util.h"
 #include <dcp/exceptions.h>
 #include <dcp/certificate_chain.h>
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/filepicker.h>
 #include <wx/validate.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <iostream>
 
 using std::string;
diff --git a/src/wx/recipients_panel.h b/src/wx/recipients_panel.h
index 15c043f1a..b33b7ebc8 100644
--- a/src/wx/recipients_panel.h
+++ b/src/wx/recipients_panel.h
@@ -19,9 +19,12 @@
 */
 
 #include "lib/dkdm_recipient.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 #include <wx/srchctrl.h>
 #include <wx/treectrl.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
 #include <list>
diff --git a/src/wx/repeat_dialog.h b/src/wx/repeat_dialog.h
index 0c4fb6a86..d3f1d32f8 100644
--- a/src/wx/repeat_dialog.h
+++ b/src/wx/repeat_dialog.h
@@ -18,8 +18,11 @@
 
 */
 
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 #include <wx/spinctrl.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include "table_dialog.h"
 
 class RepeatDialog : public TableDialog
diff --git a/src/wx/report_problem_dialog.h b/src/wx/report_problem_dialog.h
index 9bd70a50e..651087907 100644
--- a/src/wx/report_problem_dialog.h
+++ b/src/wx/report_problem_dialog.h
@@ -18,7 +18,10 @@
 
 */
 
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/dialog.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/shared_ptr.hpp>
 
 class wxTextCtrl;
diff --git a/src/wx/rgba_colour_picker.cc b/src/wx/rgba_colour_picker.cc
index 6ea3571a1..731cf9539 100644
--- a/src/wx/rgba_colour_picker.cc
+++ b/src/wx/rgba_colour_picker.cc
@@ -21,7 +21,10 @@
 #include "rgba_colour_picker.h"
 #include "wx_util.h"
 #include "static_text.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/clrpicker.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 RGBAColourPicker::RGBAColourPicker (wxWindow* parent, RGBA colour)
 	: wxPanel (parent, wxID_ANY)
diff --git a/src/wx/rgba_colour_picker.h b/src/wx/rgba_colour_picker.h
index c7972d4b3..30c81b103 100644
--- a/src/wx/rgba_colour_picker.h
+++ b/src/wx/rgba_colour_picker.h
@@ -19,7 +19,10 @@
 */
 
 #include "lib/rgba.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 class wxColourPickerCtrl;
 class wxSlider;
diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc
index 71d0ed99d..bc7065f29 100644
--- a/src/wx/screen_dialog.cc
+++ b/src/wx/screen_dialog.cc
@@ -27,10 +27,13 @@
 #include "dcpomatic_button.h"
 #include "lib/compose.hpp"
 #include "lib/util.h"
+#include "lib/warnings.h"
 #include <dcp/exceptions.h>
 #include <dcp/certificate_chain.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/filepicker.h>
 #include <wx/validate.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <iostream>
 
 using std::string;
diff --git a/src/wx/screens_panel.h b/src/wx/screens_panel.h
index 510297efb..9cf317c5a 100644
--- a/src/wx/screens_panel.h
+++ b/src/wx/screens_panel.h
@@ -18,7 +18,10 @@
 
 */
 
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <wx/srchctrl.h>
 #include <wx/treectrl.h>
 #include <boost/shared_ptr.hpp>
diff --git a/src/wx/self_dkdm_dialog.cc b/src/wx/self_dkdm_dialog.cc
index 5eae05de4..4c10c8f6b 100644
--- a/src/wx/self_dkdm_dialog.cc
+++ b/src/wx/self_dkdm_dialog.cc
@@ -26,15 +26,20 @@
 #include "lib/film.h"
 #include "lib/screen.h"
 #include "lib/config.h"
+#include "lib/warnings.h"
 #include <libcxml/cxml.h>
 #ifdef DCPOMATIC_USE_OWN_PICKER
 #include "dir_picker_ctrl.h"
 #else
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/filepicker.h>
+DCPOMATIC_ENABLE_WARNINGS
 #endif
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/treectrl.h>
 #include <wx/listctrl.h>
 #include <wx/stdpaths.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <iostream>
 
 using std::string;
diff --git a/src/wx/self_dkdm_dialog.h b/src/wx/self_dkdm_dialog.h
index 509280b5c..f49749a69 100644
--- a/src/wx/self_dkdm_dialog.h
+++ b/src/wx/self_dkdm_dialog.h
@@ -19,8 +19,11 @@
 */
 
 #include "wx_util.h"
+#include "lib/warnings.h"
 #include <dcp/types.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/shared_ptr.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <map>
diff --git a/src/wx/servers_list_dialog.h b/src/wx/servers_list_dialog.h
index 309cde77e..dc261ff1c 100644
--- a/src/wx/servers_list_dialog.h
+++ b/src/wx/servers_list_dialog.h
@@ -19,8 +19,11 @@
 */
 
 #include "lib/encode_server.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 #include <wx/listctrl.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 class ServersListDialog : public wxDialog
diff --git a/src/wx/simple_video_view.h b/src/wx/simple_video_view.h
index 643c782b8..323047ada 100644
--- a/src/wx/simple_video_view.h
+++ b/src/wx/simple_video_view.h
@@ -20,8 +20,11 @@
 
 #include "video_view.h"
 #include "lib/position.h"
+#include "lib/warnings.h"
 #include <dcp/types.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 class FilmViewer;
 
diff --git a/src/wx/subtitle_appearance_dialog.cc b/src/wx/subtitle_appearance_dialog.cc
index 76e8d8b16..6d905292e 100644
--- a/src/wx/subtitle_appearance_dialog.cc
+++ b/src/wx/subtitle_appearance_dialog.cc
@@ -29,10 +29,13 @@
 #include "lib/ffmpeg_content.h"
 #include "lib/examine_ffmpeg_subtitles_job.h"
 #include "lib/job_manager.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 #include <wx/clrpicker.h>
 #include <wx/spinctrl.h>
 #include <wx/gbsizer.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 using std::map;
 using std::string;
diff --git a/src/wx/subtitle_appearance_dialog.h b/src/wx/subtitle_appearance_dialog.h
index 6c7e46817..b0dd8d307 100644
--- a/src/wx/subtitle_appearance_dialog.h
+++ b/src/wx/subtitle_appearance_dialog.h
@@ -20,7 +20,10 @@
 
 #include "timecode.h"
 #include "lib/rgba.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
 
diff --git a/src/wx/system_font_dialog.h b/src/wx/system_font_dialog.h
index 48a31a839..da51c9c3a 100644
--- a/src/wx/system_font_dialog.h
+++ b/src/wx/system_font_dialog.h
@@ -26,7 +26,10 @@
  *  one of those fonts.
  */
 
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 #include <boost/optional.hpp>
 #include <vector>
diff --git a/src/wx/templates_dialog.h b/src/wx/templates_dialog.h
index 8ef0d956c..4a55e0beb 100644
--- a/src/wx/templates_dialog.h
+++ b/src/wx/templates_dialog.h
@@ -18,8 +18,11 @@
 
 */
 
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 #include <wx/listctrl.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 class TemplatesDialog : public wxDialog
diff --git a/src/wx/text_view.h b/src/wx/text_view.h
index 6ce22dc79..d360838a8 100644
--- a/src/wx/text_view.h
+++ b/src/wx/text_view.h
@@ -19,7 +19,10 @@
 */
 
 #include "lib/content_text.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <wx/listctrl.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
diff --git a/src/wx/time_picker.h b/src/wx/time_picker.h
index 9e83c0043..53b0ce2b8 100644
--- a/src/wx/time_picker.h
+++ b/src/wx/time_picker.h
@@ -18,7 +18,10 @@
 
 */
 
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 class wxSpinCtrl;
diff --git a/src/wx/timeline_content_view.h b/src/wx/timeline_content_view.h
index 27cfed53e..2573e3cb3 100644
--- a/src/wx/timeline_content_view.h
+++ b/src/wx/timeline_content_view.h
@@ -22,8 +22,11 @@
 #define DCPOMATIC_TIMELINE_CONTENT_VIEW_H
 
 #include "lib/types.h"
+#include "lib/warnings.h"
 #include "timeline_view.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 class Content;
diff --git a/src/wx/try_unmount_dialog.h b/src/wx/try_unmount_dialog.h
index 9ae7de933..de686f14c 100644
--- a/src/wx/try_unmount_dialog.h
+++ b/src/wx/try_unmount_dialog.h
@@ -18,7 +18,10 @@
 
 */
 
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 class TryUnmountDialog : public wxDialog
 {
diff --git a/src/wx/update_dialog.cc b/src/wx/update_dialog.cc
index e864564ac..373e518b1 100644
--- a/src/wx/update_dialog.cc
+++ b/src/wx/update_dialog.cc
@@ -21,7 +21,10 @@
 #include "update_dialog.h"
 #include "static_text.h"
 #include "wx_util.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/hyperlink.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 using std::string;
 using boost::optional;
diff --git a/src/wx/update_dialog.h b/src/wx/update_dialog.h
index 2db12ab64..096699f39 100644
--- a/src/wx/update_dialog.h
+++ b/src/wx/update_dialog.h
@@ -18,7 +18,10 @@
 
 */
 
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/optional.hpp>
 
 class UpdateDialog : public wxDialog
diff --git a/src/wx/verify_dcp_dialog.cc b/src/wx/verify_dcp_dialog.cc
index 42728614f..6432d21c7 100644
--- a/src/wx/verify_dcp_dialog.cc
+++ b/src/wx/verify_dcp_dialog.cc
@@ -21,8 +21,11 @@
 #include "verify_dcp_dialog.h"
 #include "wx_util.h"
 #include "lib/verify_dcp_job.h"
+#include "lib/warnings.h"
 #include <dcp/verify.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/richtext/richtextctrl.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/foreach.hpp>
 
 using std::list;
diff --git a/src/wx/verify_dcp_dialog.h b/src/wx/verify_dcp_dialog.h
index d2f21863d..b67c1dfc7 100644
--- a/src/wx/verify_dcp_dialog.h
+++ b/src/wx/verify_dcp_dialog.h
@@ -19,7 +19,10 @@
 */
 
 #include <dcp/verify.h>
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <list>
 
 class wxRichTextCtrl;
diff --git a/src/wx/video_waveform_dialog.h b/src/wx/video_waveform_dialog.h
index ac3a72dde..252720f60 100644
--- a/src/wx/video_waveform_dialog.h
+++ b/src/wx/video_waveform_dialog.h
@@ -18,7 +18,10 @@
 
 */
 
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/weak_ptr.hpp>
 
 class VideoWaveformPlot;
diff --git a/src/wx/video_waveform_plot.h b/src/wx/video_waveform_plot.h
index 380186074..1e38f5890 100644
--- a/src/wx/video_waveform_plot.h
+++ b/src/wx/video_waveform_plot.h
@@ -18,7 +18,10 @@
 
 */
 
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 #include <boost/signals2.hpp>
diff --git a/src/wx/wx_signal_manager.cc b/src/wx/wx_signal_manager.cc
index 95e71cbc0..78a98b1d6 100644
--- a/src/wx/wx_signal_manager.cc
+++ b/src/wx/wx_signal_manager.cc
@@ -18,8 +18,11 @@
 
 */
 
-#include <wx/wx.h>
 #include "wx_signal_manager.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
+#include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 wxSignalManager::wxSignalManager (wxEvtHandler* h)
 	: _handler (h)
diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index f8756549b..46b122a8a 100644
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -31,11 +31,14 @@
 #include "lib/util.h"
 #include "lib/cross.h"
 #include "lib/job.h"
+#include "lib/warnings.h"
 #include <dcp/locale_convert.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/spinctrl.h>
 #include <wx/splash.h>
 #include <wx/progdlg.h>
 #include <wx/filepicker.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/thread.hpp>
 
 using std::string;