Hide warnings triggered by Ubuntu 20.04's gcc.

diff --git a/src/lib/warnings.h b/src/lib/warnings.h
index 4414755f59bc02c8dcf73f36355d139929e1c3d3..f55f657bf965b2fa04b8431de66df5aa298d81e1 100644 (file)
--- a/src/lib/warnings.h
+++ b/src/lib/warnings.h
@@ -22,6 +22,7 @@
   _Pragma("GCC diagnostic push") \
   _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") \
   _Pragma("GCC diagnostic ignored \"-Wmissing-field-initializers\"") \
+  _Pragma("GCC diagnostic ignored \"-Wdeprecated-copy\"") \
   _Pragma("GCC diagnostic ignored \"-Wunused-parameter\"")
 
 #define DCPOMATIC_ENABLE_WARNINGS \

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 75b4025aa554ef2d7956e77fd51fb612c66c3bfc..3680e2802dd8d7fb98a34cbcc4f640b828770a05 100644 (file)
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -84,14 +84,17 @@
 #include "lib/text_content.h"
 #include "lib/dcpomatic_log.h"
 #include "lib/subtitle_encoder.h"
+#include "lib/warnings.h"
 #include <dcp/exceptions.h>
 #include <dcp/raw_convert.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/generic/aboutdlgg.h>
 #include <wx/stdpaths.h>
 #include <wx/cmdline.h>
 #include <wx/preferences.h>
 #include <wx/splash.h>
 #include <wx/wxhtml.h>
+DCPOMATIC_ENABLE_WARNINGS
 #ifdef __WXGTK__
 #include <X11/Xlib.h>
 #endif

diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index 84573797e996b1b043a8569a389edee626962707..1d623abcd9222ad195185e83718591795b738120 100644 (file)
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -51,10 +51,13 @@
 #include <dcp/encrypted_kdm.h>
 #include <dcp/decrypted_kdm.h>
 #include <dcp/exceptions.h>
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 #include <wx/preferences.h>
 #include <wx/splash.h>
 #include <wx/filepicker.h>
+DCPOMATIC_ENABLE_WARNINGS
 #ifdef __WXOSX__
 #include <ApplicationServices/ApplicationServices.h>
 #endif

diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index cb4779ee3722c949278a7bdb1f4b4501f0a83164..a4ef0bc62a28ec8f37fd28b6cd7a3919173992fc 100644 (file)
--- a/src/tools/dcpomatic_server.cc
+++ b/src/tools/dcpomatic_server.cc
@@ -29,9 +29,12 @@
 #include "lib/signaller.h"
 #include "lib/cross.h"
 #include "lib/dcpomatic_log.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/taskbar.h>
 #include <wx/splash.h>
 #include <wx/icon.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/thread.hpp>
 #include <boost/foreach.hpp>
 #include <boost/optional.hpp>

diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index 4f58b2d1882a6cd8383871592483cf6bd443e9f5..b3e68f4d1e9e2b28a45ecab31dd1d4c8b398009c 100644 (file)
--- 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 c1965459998ced7f4859b14113b87c017dad42bb..f3bb65a6c9d95e2868b8f725ad359ead00d664b4 100644 (file)
--- 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 93c33152aee997e5d73fca8f76e64d234f6888ba..e5625d415b5662f8e7885102d9058e1513eb1914 100644 (file)
--- 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 9e3ff787d93e7cf4b9c455c0fe99d1638815d59f..e1c96fdebe962d35784f5940c63aa03a52ed9a33 100644 (file)
--- 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 3057416b29c623e1ad7b7c8fc06b223e89ccf221..e20e5289bc30901948d51a7d4b1a8a779fe8f927 100644 (file)
--- 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 6eb853dce175349ee33f5a3c8878da15e71baac1..989f15edc04546e52f3decbb7e1c2a482d223d6a 100644 (file)
--- 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 5c366ca7b0dbe2cc9d9f61e8eba4002b5e71c6ff..cfdab5f3c2c39393e7eaefcb5fe1f6b5df991444 100644 (file)
--- 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 f47408a4ff740a97878da93a33c7fda6e6baeee4..afbe9ed2ebe81e381cb0fba1658758e191ece458 100644 (file)
--- 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 ba5d0c6fd02fda64765d6badc85fae4dc39e0614..b8c12d7b2aa36615f14ac564f9d1311c391ddb5e 100644 (file)
--- 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 d5f502eeaf2a59608be487a9ccfb520feabb8d85..128a3862d44839c456959964973b71c6e9b6c374 100644 (file)
--- 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 334e9bb68202449a8053324cf5d6b854239a9085..3f4a65ab1bc1e58f1258ea6a6de219ee2e7c17a4 100644 (file)
--- 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 b9c4604b6b298b7cd80d785ff759bbad58079e1e..1d6273af68088172e9e9702ee1c496a1a5e9d4a5 100644 (file)
--- 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 3452d5765b943f346db9e1fb015b006e2e72e06e..bb8be8e8024e26ca77fdb8539c255e2445a56a4c 100644 (file)
--- 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 4c9ccf388223b8bd161d196b4a751f2f58317113..485b6acf5b519e4982479ccecc67cfba180bcd44 100644 (file)
--- 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 b05e73273d99d0703379ff109b5c1e70f200b9cf..289316820a3aa8bd2d806220b85546fcdff7297f 100644 (file)
--- 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 869092faac7404a6a2a654a8328ff57305faaf29..c690ea25d82b7658bf0a39a474685df03fb171fd 100644 (file)
--- 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 3f8730ae3a06e108c3d54866eac0d3236dddd933..d8645ff9713d5e8a24d51aded011e87fb1ac4f23 100644 (file)
--- 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 a2fbf808f768b39c77e5f56a1e9e7ea0cff57ac9..ef241a0cab5d046ba9b2edcfed25af74a6f34627 100644 (file)
--- 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 ce6e1e2e98980fdd44be7c5b3fcbdb69cdc8ca3a..fa627cd81d51a36c12e9f2e9ad10d95caeb885b1 100644 (file)
--- 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 47211a269149b83815922b53e5a0005822e04bd2..3eb05e44dcd966226fe2d0d582e41dfabfb980cc 100644 (file)
--- 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 b8d862f8112ea03ebddf64d8976e22a0f9240850..84a1d361b7e3af37afec1085930a7e5b5156fdd6 100644 (file)
--- 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 cfa29670154db5e4751a23697ce10231b7c74eaa..f2f0826803c3ec98ec1deddc13ea4252f1b2eb07 100644 (file)
--- 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 29985a5816bb701b44ec3e0a5c0e92672b8a4d8c..6e995813c5c0215751ec2ba52f31df6701330903 100644 (file)
--- 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 3ba4a09f5992342ef2e0e8593a20e80d872bde7f..775995f38f9c1fb4972e0594d32264ad010edcaf 100644 (file)
--- 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 f4f23cb283c7dba8eff4a7e9546a80cb54c9271d..e10075f3ad30418c2eb2e5a7712753ad3e1e054c 100644 (file)
--- 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 ba98e0963877b82ccf05982b4b81da161dd4ce99..260e74c3dcd58715f79e1b8f762446fdf1a4e773 100644 (file)
--- 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 3675b8ddcb6025dce1c84b37a917e6b3d7ee2e57..fcf5dbcf251c890ca38945cc708ebbc945628874 100644 (file)
--- 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 cb0de450a73ad7d141941536c003f4f057cfddf7..c98cbae07b2c16bb9e2b002706212cac13c5b557 100644 (file)
--- 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 1fac9d11e63afa43ac33d65d52bc30e4089be00b..87dcf19535d977e7d8e8c89e824ccdb2f037707c 100644 (file)
--- 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 b5f86e7a131de7c823fd4cb293e0d82d069f7e99..873aa718cf5026da1bd3b29c1cca1395b1dae0aa 100644 (file)
--- 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 f5fc76e4f67eced0a9f1c8b590d4de5187eb9c3a..9da4c82151d06b7ce4bf53dc893b5d5c5c0e77c3 100644 (file)
--- 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 3dfdbe2b08c343ac4a0175369c51bf1eafb3ee2f..2198fb426928433b61c288a7738843e880dacc6f 100644 (file)
--- 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 f9fe96d6a7b0319cbe9b7e0e009364f5b91bed5d..418a1145db939b50e746f8ae67858f1ff23f615c 100644 (file)
--- 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 77114a97c382b170f06758d58d1d8f2d41fb52af..2e471532fe1e7399a7e9b0978bbafcfe6e99fa80 100644 (file)
--- 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 9d6db76c6f2a7f2b0b50e1a6b1499a1f9401717f..4b461b8139e78795dc4d42ffbf9f9f3b1da5a536 100644 (file)
--- 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 a345d0e963b62ed37dc6acde857f80998f11bd87..b138e7d31574b828f580a06548f44c12ddb03482 100644 (file)
--- 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 51a99627c902d0260a5eb4e73f4e61866424bd6a..2734a9894240e5a7ee7c0a08d022e2a1b4fad3f5 100644 (file)
--- 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 a926864dbb72da8ee1904c68271064b6229c0a3a..be2e9309b660ca06afe34791fc9c99d3df29b3ef 100644 (file)
--- 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 fbbaa1aee9fd2c12178d87ce6303c51b4a8b1a2a..e2c261873959074522a02a6356794beb0495388c 100644 (file)
--- 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 acf20f129884173d4ee3988dd848a66752f5c790..bc5ae69621395653bbee9a512f0f31e47aab05b2 100644 (file)
--- 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 2ae3f5e930911e887990088b3a848a717c29f2a8..32c78ea252ba8f5a668235ae4db6b6696cb8d1d9 100644 (file)
--- 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 b7cc9331995d4fd4c494bd275cb4631dfc6227e1..5939e5264ec31b3dab288c21acb4bcb889907b56 100644 (file)
--- 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 b932281746b0fe37c2e00c4860f3ce8d58935404..ae3e134295f3442694a1dceda5fcff9816f83d32 100644 (file)
--- 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 9da73762f38d44860efedb7ac0780805090e5366..c8cc14676a3f8f87b0b06cba96519a8f1912a9ec 100644 (file)
--- 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 a3b05173a40bdfb8189cdacdf5c39ccf2fdbd5fd..6b99065f632b05a224d990dde62978ee2810b600 100644 (file)
--- 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 94d5e3debc96ffa1c94d5990266185d83d289581..f0bb547080a4ef5bd8dc27d79c088024a3ed549c 100644 (file)
--- 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 15c043f1aa693f6d5167ac2332dbbf6c362c83e7..b33b7ebc88e6e6749f831cfdeae9353500ee584b 100644 (file)
--- 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 0c4fb6a865345b0331849b0f14d619b07f3f3afd..d3f1d32f86fcb73938f1b3b8622dc6a06077c870 100644 (file)
--- 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 9bd70a50e7c73226f44dc644b53814de63c9dcec..651087907d24d038432efa9f9679d6935e342367 100644 (file)
--- 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 6ea3571a102799c085ab6b7d460959b3a3e66e4c..731cf95396181cc9ef72814ee56f9533c903b3e5 100644 (file)
--- 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 c7972d4b3ec157f9d8427f32a7027b2ec10b8cab..30c81b103b107dc78d039ac1a24a0562b4ff20c5 100644 (file)
--- 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 71d0ed99d27dfe74d0f8326a2a4864387a8b0a14..bc7065f294ede1d823e749bdfba09c0e84dd5abe 100644 (file)
--- 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 510297efb67a285e2bc06b722042b3e90519182d..9cf317c5a143becc3489d5474977197ea89c714f 100644 (file)
--- 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 5eae05de40f7cfdbadd59e2179f1f31c83df0b09..4c10c8f6bce7ad58ff3a1c775122312229fcf3c2 100644 (file)
--- 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 509280b5cc482e1d6e3efa62cdbcd09f3c03f30e..f49749a69fa748abf412e1a8f0ff6f311c5c0f0c 100644 (file)
--- 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 309cde77e39fc0405890120c7b2f82396425658e..dc261ff1c8e718de348017b7170ccfa06e597db6 100644 (file)
--- 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 643c782b80d554fa441c391ff40315c7fcbc38e3..323047adaca9182fcc237c0dfa6a330aa3f6cfd7 100644 (file)
--- 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 76e8d8b16d00f1df23698d07257278779f43f14d..6d905292eff2b4e8965dc9d92c875a7136f5425c 100644 (file)
--- 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 6c7e468178dc638c2fd0e742e4a4fedef5530dbf..b0dd8d30723775a852eb66234e7f25968c382e28 100644 (file)
--- 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 48a31a839160223d4408da4347a6e3575d55ab8a..da51c9c3a072322cb1a28d371f212130f5877978 100644 (file)
--- 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 8ef0d956ccf78099fa70f5e3782d2c6ead0d00c7..4a55e0beb5dbb4c1512efb12486bc752997efcb3 100644 (file)
--- 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 6ce22dc799dfa9f579b733a0a023faf2bc10a1f9..d360838a834327ea5063d6d821dd1c6e65774691 100644 (file)
--- 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 9e83c00430709cc158dc1b23d6f530548c01ff39..53b0ce2b8886214128ce476b1de2c2efe6f1f05d 100644 (file)
--- 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 27cfed53eef989373eee4db604886d4890c3facb..2573e3cb311b970cc181c1a76825b04beaa955bc 100644 (file)
--- 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 9ae7de933966b3da4c331f896f21562952836e7b..de686f14ca68317697eca4ff72c13e88d7b2de40 100644 (file)
--- 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 e864564acd118c7822eda99cba6c99db7faca67f..373e518b1e46ee5000916cf5bd38ab532c153edd 100644 (file)
--- 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 2db12ab6465440b71a3862a9937287a151c2bfcc..096699f39df3c0e6a741b9ad32d2c658fcdbeae8 100644 (file)
--- 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 42728614f2b0f18425f98a872144a3833bfff492..6432d21c7a9922930cf094a620bf4ea9de47dea1 100644 (file)
--- 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 d2f21863d606eaf389c788c5a1bbb31e1e1b8517..b67c1dfc74429ce9e5dca9656fbbcfcdcba3756c 100644 (file)
--- 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 ac3a72dde524a331b4d427ff58c876df2c6b6a2c..252720f606214764d7a328b2ee555dd328c05df9 100644 (file)
--- 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 3801860740008cf82550a5431f4d50de46893100..1e38f58906b35d4b7f5d7b00802bcb1126943785 100644 (file)
--- 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 95e71cbc0ee99d8b275ad5b6b121b4196d8be93b..78a98b1d60e036bd433acb9399f3ac45e4479fba 100644 (file)
--- 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 f8756549b44bca308ca591cace3c3859a9fea02e..46b122a8a6c82dca3231e2740553f8ce8c7ed6c7 100644 (file)
--- 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;