Disable warnings around all wx includes.

diff --git a/src/tools/dcpomatic_batch.cc b/src/tools/dcpomatic_batch.cc
index ef8816708bbdd4017ef267c5c490fe00a889a2eb..1b84ca2bc38591bc8095d5e0ad009fd03b0e3cf9 100644 (file)
--- a/src/tools/dcpomatic_batch.cc
+++ b/src/tools/dcpomatic_batch.cc
@@ -36,12 +36,15 @@
 #include "lib/transcode_job.h"
 #include "lib/util.h"
 #include "lib/version.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/aboutdlg.h>
 #include <wx/cmdline.h>
 #include <wx/preferences.h>
 #include <wx/splash.h>
 #include <wx/stdpaths.h>
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <iostream>
 #include <set>
 

diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 4d4531eeed035a9c94f04f0187a24b82c354b5c5..1ab83a23079436e9d9323a84aadc65f18f3f4414 100644 (file)
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -57,11 +57,13 @@
 #include "lib/util.h"
 #include "lib/verify_dcp_job.h"
 #include "lib/video_content.h"
+#include "lib/warnings.h"
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
 #include <dcp/raw_convert.h>
 #include <dcp/exceptions.h>
 #include <dcp/search.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/cmdline.h>
 #include <wx/display.h>
 #include <wx/preferences.h>
@@ -69,6 +71,7 @@
 #include <wx/splash.h>
 #include <wx/stdpaths.h>
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #ifdef __WXGTK__
 #include <X11/Xlib.h>
 #endif

diff --git a/src/tools/dcpomatic_playlist.cc b/src/tools/dcpomatic_playlist.cc
index 056bc7512f68041397e9fd6238d9cd1dd1d85c8f..5bae0c4297687a37eb2958e8964966471003c9ed 100644 (file)
--- a/src/tools/dcpomatic_playlist.cc
+++ b/src/tools/dcpomatic_playlist.cc
@@ -32,11 +32,14 @@
 #include "lib/spl.h"
 #include "lib/spl_entry.h"
 #include "lib/util.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/imaglist.h>
 #include <wx/listctrl.h>
 #include <wx/preferences.h>
 #include <wx/spinctrl.h>
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::cout;

diff --git a/src/wx/audio_gain_dialog.cc b/src/wx/audio_gain_dialog.cc
index 2c0f17c0a5c6403d27895cd882ebe65db3b4d1a1..13510e9d19c6c81d42ed3c4aea3066452a978722 100644 (file)
--- a/src/wx/audio_gain_dialog.cc
+++ b/src/wx/audio_gain_dialog.cc
@@ -22,7 +22,10 @@
 #include "audio_gain_dialog.h"
 #include "wx_util.h"
 #include "lib/maths_util.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/spinctrl.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <cmath>
 
 

diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc
index fed1e9c6a0934c459e175632665aa6ad4f565063..cfea4f0264a5b8a55ea200e1b94de5ea11f9db89 100644 (file)
--- a/src/wx/audio_panel.cc
+++ b/src/wx/audio_panel.cc
@@ -36,7 +36,10 @@
 #include "lib/ffmpeg_content.h"
 #include "lib/job_manager.h"
 #include "lib/maths_util.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/spinctrl.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <iostream>
 
 

diff --git a/src/wx/audio_plot.cc b/src/wx/audio_plot.cc
index a4518d5dd484141b36f5924f00347f57b3554c04..0e9e815e1cce07d83c095a8be90a6ba9f864cf94 100644 (file)
--- a/src/wx/audio_plot.cc
+++ b/src/wx/audio_plot.cc
@@ -26,7 +26,10 @@
 #include "lib/audio_analysis.h"
 #include "lib/compose.hpp"
 #include "lib/maths_util.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/graphics.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/bind/bind.hpp>
 #include <cfloat>
 

diff --git a/src/wx/batch_job_view.cc b/src/wx/batch_job_view.cc
index c93bf1ebaff19a4b7c9c97c315f7b28080f3f26f..6ce9f46806cb4fe5668b958ec03a1dd72b16dcc7 100644 (file)
--- a/src/wx/batch_job_view.cc
+++ b/src/wx/batch_job_view.cc
@@ -22,8 +22,11 @@
 #include "batch_job_view.h"
 #include "dcpomatic_button.h"
 #include "lib/job_manager.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/button.h>
 #include <wx/sizer.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::list;

diff --git a/src/wx/check_box.h b/src/wx/check_box.h
index 5176cd2e8cce4d3245e58a2d13eb3ce8aa1f4fe2..65952040aba803bc32a02a82beec353faa08f769 100644 (file)
--- a/src/wx/check_box.h
+++ b/src/wx/check_box.h
@@ -24,7 +24,10 @@
 
 
 #include "i18n_hook.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 class CheckBox : public wxCheckBox, public I18NHook

diff --git a/src/wx/cinema_dialog.h b/src/wx/cinema_dialog.h
index e0594b5d81d059ef69bcf06b2e7c05956c1093a3..32dd77264e07e9c5b56b64ec009bfa168db93f7d 100644 (file)
--- a/src/wx/cinema_dialog.h
+++ b/src/wx/cinema_dialog.h
@@ -22,7 +22,10 @@
 #include "editable_list.h"
 #include "email_dialog.h"
 #include "table_dialog.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <list>
 #include <vector>
 

diff --git a/src/wx/colour_conversion_editor.cc b/src/wx/colour_conversion_editor.cc
index 908968712131848a73c7ae571c967de7b7acaebf..b4cf90fe79ac72223892a093fa8346b5f35468f4 100644 (file)
--- a/src/wx/colour_conversion_editor.cc
+++ b/src/wx/colour_conversion_editor.cc
@@ -24,14 +24,17 @@
 #include "static_text.h"
 #include "wx_util.h"
 #include "lib/colour_conversion.h"
+#include "lib/warnings.h"
 #include <dcp/gamma_transfer_function.h>
 #include <dcp/identity_transfer_function.h>
 #include <dcp/locale_convert.h>
 #include <dcp/modified_gamma_transfer_function.h>
 #include <dcp/s_gamut3_transfer_function.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/gbsizer.h>
 #include <wx/numformatter.h>
 #include <wx/spinctrl.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::dynamic_pointer_cast;

diff --git a/src/wx/colour_conversion_editor.h b/src/wx/colour_conversion_editor.h
index bdf185227a842966cb336309108cd623afcb58ca..294cdbf82627fbccaa2f2ff0c7121fa38b7b8c7b 100644 (file)
--- a/src/wx/colour_conversion_editor.h
+++ b/src/wx/colour_conversion_editor.h
@@ -23,8 +23,11 @@
 #define DCPOMATIC_COLOUR_CONVERSION_EDITOR_H
 
 
-#include <boost/signals2.hpp>
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
+#include <boost/signals2.hpp>
 
 
 class ColourConversion;

diff --git a/src/wx/confirm_kdm_email_dialog.h b/src/wx/confirm_kdm_email_dialog.h
index 311cb08ea6dbddcd8a171e4f5bbf417011d893eb..7360f3513c021c8cac49a669ee757de4e1f77927 100644 (file)
--- a/src/wx/confirm_kdm_email_dialog.h
+++ b/src/wx/confirm_kdm_email_dialog.h
@@ -18,10 +18,15 @@
 
 */
 
+
 #include "question_dialog.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <list>
 
+
 class ConfirmKDMEmailDialog : public QuestionDialog
 {
 public:

diff --git a/src/wx/content_colour_conversion_dialog.cc b/src/wx/content_colour_conversion_dialog.cc
index b970618a7b973126311be88ce30ab4392c5dcf6a..54f56f432cb041ebeaa7d5a128afa5f22f66de18 100644 (file)
--- a/src/wx/content_colour_conversion_dialog.cc
+++ b/src/wx/content_colour_conversion_dialog.cc
@@ -26,7 +26,10 @@
 #include "lib/colour_conversion.h"
 #include "lib/config.h"
 #include "lib/util.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/statline.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <iostream>
 
 

diff --git a/src/wx/content_colour_conversion_dialog.h b/src/wx/content_colour_conversion_dialog.h
index d0fb74823e97bc518e3e35bcdfbc06001f25b791..ec9d374b7e7b70f937e28bbf7f023edc7b34a5e0 100644 (file)
--- a/src/wx/content_colour_conversion_dialog.h
+++ b/src/wx/content_colour_conversion_dialog.h
@@ -20,7 +20,10 @@
 
 
 #include "lib/colour_conversion.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 

diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc
index fe117aac03521e9f1d198a512d62b84667d91852..47f88b4910f5f62baaa64d3aa7d5b2a0863636c0 100644 (file)
--- a/src/wx/content_menu.cc
+++ b/src/wx/content_menu.cc
@@ -39,12 +39,15 @@
 #include "lib/image_content.h"
 #include "lib/job_manager.h"
 #include "lib/playlist.h"
+#include "lib/warnings.h"
 #include <dcp/cpl.h>
 #include <dcp/decrypted_kdm.h>
 #include <dcp/exceptions.h>
 #include <dcp/search.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/dirdlg.h>
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::dynamic_pointer_cast;

diff --git a/src/wx/content_menu.h b/src/wx/content_menu.h
index 240a9e64f9be2c18da7daa99fe6135f6e83f735f..dceb0effe833a4286ae05cf5b2c354716d0e5829 100644 (file)
--- a/src/wx/content_menu.h
+++ b/src/wx/content_menu.h
@@ -25,7 +25,10 @@
 
 #include "timeline_content_view.h"
 #include "lib/types.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <memory>
 
 

diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index db29ed74a1fee6d2bcaf37c9de725b19fc1de5c0..e42413d9dceb83d780e01014529af248873c7eff 100644 (file)
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -45,10 +45,13 @@
 #include "lib/string_text_file_content.h"
 #include "lib/text_content.h"
 #include "lib/video_content.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/display.h>
 #include <wx/listctrl.h>
 #include <wx/notebook.h>
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 
 

diff --git a/src/wx/content_panel.h b/src/wx/content_panel.h
index 21acd28b264a3533853615106142000bd900e694..604a15fe49d575bc4470eb25905160bf732ed1d2 100644 (file)
--- a/src/wx/content_panel.h
+++ b/src/wx/content_panel.h
@@ -22,7 +22,10 @@
 #include "content_menu.h"
 #include "lib/film.h"
 #include "lib/types.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/splitter.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <list>
 
 

diff --git a/src/wx/content_sub_panel.cc b/src/wx/content_sub_panel.cc
index d170d6edd514342d4c64674fb7f7455fa20036e7..0c775287ac69ab2ec5cd8e9b03c6033a4866ccfe 100644 (file)
--- a/src/wx/content_sub_panel.cc
+++ b/src/wx/content_sub_panel.cc
@@ -25,7 +25,10 @@
 #include "lib/dcp_content.h"
 #include "lib/compose.hpp"
 #include "lib/log.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/notebook.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::list;

diff --git a/src/wx/content_view.cc b/src/wx/content_view.cc
index 7a20cc3445f121f265f6de61a87e167767de5e59..a020f81486f458fbad053f1b541727555cb997c4 100644 (file)
--- a/src/wx/content_view.cc
+++ b/src/wx/content_view.cc
@@ -28,10 +28,13 @@
 #include "lib/dcpomatic_assert.h"
 #include "lib/examine_content_job.h"
 #include "lib/job_manager.h"
+#include "lib/warnings.h"
 #include <dcp/exceptions.h>
 #include <boost/filesystem.hpp>
 #include <boost/optional.hpp>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/progdlg.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::cout;

diff --git a/src/wx/content_widget.h b/src/wx/content_widget.h
index 62561192d6ebf7e27fb3b6a8ab98d2034b2a868c..23b409a97287d61b7768500335e7583e93f0836b 100644 (file)
--- a/src/wx/content_widget.h
+++ b/src/wx/content_widget.h
@@ -29,9 +29,12 @@
 
 #include "wx_util.h"
 #include "lib/content.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/gbsizer.h>
 #include <wx/spinctrl.h>
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <vector>
 
 

diff --git a/src/wx/controls.cc b/src/wx/controls.cc
index 5b1e62c2e06244f3d04f0a479677695dc2bc20bf..62fec0a75b958608ed0dba1cfeb46c6522c546e4 100644 (file)
--- a/src/wx/controls.cc
+++ b/src/wx/controls.cc
@@ -35,14 +35,17 @@
 #include "lib/job.h"
 #include "lib/job_manager.h"
 #include "lib/player_video.h"
+#include "lib/warnings.h"
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
 #include <dcp/reel.h>
 #include <dcp/reel_picture_asset.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/listctrl.h>
 #include <wx/progdlg.h>
 #include <wx/tglbtn.h>
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::cout;

diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc
index 1e626bf183b598957883646fd9ae2cea4287dbb5..914068b113321bac45cee520310fd3cd703d0ccf 100644 (file)
--- a/src/wx/dcp_panel.cc
+++ b/src/wx/dcp_panel.cc
@@ -43,11 +43,14 @@
 #include "lib/text_content.h"
 #include "lib/util.h"
 #include "lib/video_content.h"
+#include "lib/warnings.h"
 #include <dcp/locale_convert.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/gbsizer.h>
 #include <wx/notebook.h>
 #include <wx/spinctrl.h>
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/lexical_cast.hpp>
 
 

diff --git a/src/wx/dcpomatic_button.h b/src/wx/dcpomatic_button.h
index aba41b12562908ecadc3bda3a283183e7ec1ddb8..7e0e01dc2746da41dc5190023ce5a9816e54c2ab 100644 (file)
--- a/src/wx/dcpomatic_button.h
+++ b/src/wx/dcpomatic_button.h
@@ -18,11 +18,17 @@
 
 */
 
+
 #ifndef DCPOMATIC_BUTTON_H
 #define DCPOMATIC_BUTTON_H
 
+
 #include "i18n_hook.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/button.h>
+DCPOMATIC_ENABLE_WARNINGS
+
 
 class Button : public wxButton, public I18NHook
 {
@@ -33,4 +39,5 @@ public:
        wxString get_text () const override;
 };
 
+
 #endif

diff --git a/src/wx/dcpomatic_spin_ctrl.cc b/src/wx/dcpomatic_spin_ctrl.cc
index 9d255f77a868b6815a5f6c42fed9b16570bfa705..7d39721514f14ee8486faf62a9aa37edbca74ebe 100644 (file)
--- a/src/wx/dcpomatic_spin_ctrl.cc
+++ b/src/wx/dcpomatic_spin_ctrl.cc
@@ -20,9 +20,12 @@
 
 
 #include "dcpomatic_spin_ctrl.h"
+#include "lib/warnings.h"
 #include <boost/bind/bind.hpp>
 #include <boost/version.hpp>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 #if BOOST_VERSION >= 106100

diff --git a/src/wx/dkdm_dialog.cc b/src/wx/dkdm_dialog.cc
index e9fd89304bce1dd34d9ef1a0fe94d93b5567a938..5743cd71204bf079cc53fa61f952cf89e37febb3 100644 (file)
--- a/src/wx/dkdm_dialog.cc
+++ b/src/wx/dkdm_dialog.cc
@@ -32,10 +32,13 @@
 #include "lib/film.h"
 #include "lib/job_manager.h"
 #include "lib/kdm_with_metadata.h"
+#include "lib/warnings.h"
 #include <libcxml/cxml.h>
 #include <dcp/exceptions.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/listctrl.h>
 #include <wx/treectrl.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <iostream>
 
 

diff --git a/src/wx/dkdm_dialog.h b/src/wx/dkdm_dialog.h
index 132b30aefc8d1260502081552ae093232dad820e..5e7f019082e37a012602840db4756c9ba82ef417 100644 (file)
--- a/src/wx/dkdm_dialog.h
+++ b/src/wx/dkdm_dialog.h
@@ -19,8 +19,11 @@
 */
 
 
+#include "lib/warnings.h"
 #include "wx_util.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <map>
 
 

diff --git a/src/wx/dkdm_output_panel.h b/src/wx/dkdm_output_panel.h
index 821a41deb992f3bc76c5988fb320a172b11a9f23..9ad2a40a5f8744fa298c5cfe072ce10a52d65fae 100644 (file)
--- a/src/wx/dkdm_output_panel.h
+++ b/src/wx/dkdm_output_panel.h
@@ -22,8 +22,11 @@
 #include "name_format_editor.h"
 #include "wx_util.h"
 #include "lib/kdm_with_metadata.h"
+#include "lib/warnings.h"
 #include <dcp/types.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 
 

diff --git a/src/wx/editable_list.h b/src/wx/editable_list.h
index ac201580b8233c9384b318e1bf406fead683f859..6bf7f7b628421d3937b8771997af70036940081e 100644 (file)
--- a/src/wx/editable_list.h
+++ b/src/wx/editable_list.h
@@ -25,8 +25,11 @@
 
 #include "dcpomatic_button.h"
 #include "wx_util.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/listctrl.h>
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <vector>
 
 

diff --git a/src/wx/export_subtitles_dialog.h b/src/wx/export_subtitles_dialog.h
index 173dd34625a2f566a090dd72353307dc6139a149..c53df820ef1a6630178591643b87d40a5c73a2ae 100644 (file)
--- a/src/wx/export_subtitles_dialog.h
+++ b/src/wx/export_subtitles_dialog.h
@@ -18,13 +18,19 @@
 
 */
 
+
 #include "dir_picker_ctrl.h"
 #include "table_dialog.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 
+
 class FilePickerCtrl;
 
+
 class ExportSubtitlesDialog : public TableDialog
 {
 public:

diff --git a/src/wx/export_video_file_dialog.h b/src/wx/export_video_file_dialog.h
index a58fadd3846933c448addcb4b5114de79f8ea2ea..0c93965ad6f15b84db51f52f13ebd6145ca3b076 100644 (file)
--- a/src/wx/export_video_file_dialog.h
+++ b/src/wx/export_video_file_dialog.h
@@ -18,13 +18,19 @@
 
 */
 
+
 #include "table_dialog.h"
 #include "lib/ffmpeg_encoder.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 
+
 class FilePickerCtrl;
 
+
 class ExportVideoFileDialog : public TableDialog
 {
 public:

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 28baf566e8228c1f662e5a26416dcbea13d0aba2..d7493ad6346a9f92e289620de918e99a76a3c511 100644 (file)
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -32,8 +32,11 @@
 #include "lib/dcp_content.h"
 #include "lib/film.h"
 #include "lib/job_manager.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/notebook.h>
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::list;

diff --git a/src/wx/film_name_location_dialog.cc b/src/wx/film_name_location_dialog.cc
index 098676a9eefcd039ea338864dea1719562125d46..e6a31190190a790893553ac99c3c79b83add3316 100644 (file)
--- a/src/wx/film_name_location_dialog.cc
+++ b/src/wx/film_name_location_dialog.cc
@@ -28,7 +28,10 @@
 #endif
 #include "lib/compose.hpp"
 #include "lib/config.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/stdpaths.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 
 

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index f7c50b98aa07cc62b75fcd9916b98c2570ff3980..8cff277f30ed64aec900c2a8575539fe959124d5 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -51,11 +51,14 @@
 #include "lib/util.h"
 #include "lib/video_content.h"
 #include "lib/video_decoder.h"
+#include "lib/warnings.h"
 extern "C" {
 #include <libavutil/pixfmt.h>
 }
 #include <dcp/exceptions.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/tglbtn.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <iomanip>
 
 

diff --git a/src/wx/fonts_dialog.cc b/src/wx/fonts_dialog.cc
index 43e914cee48d1cd9af56ab6c9f3899b87e30fe12..668d8798b000bb9105cc02ee26ae3cd71c57e3f9 100644 (file)
--- a/src/wx/fonts_dialog.cc
+++ b/src/wx/fonts_dialog.cc
@@ -26,7 +26,10 @@
 #include "lib/content.h"
 #include "lib/font.h"
 #include "lib/text_content.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <memory>
 
 

diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc
index 0699bff223f4808b541c84d1e5ef59eccbc82d70..3b9955beaedfc5961a01dffd9e2ee93ed99184cc 100644 (file)
--- a/src/wx/full_config_dialog.cc
+++ b/src/wx/full_config_dialog.cc
@@ -52,13 +52,16 @@
 #include "lib/log.h"
 #include "lib/ratio.h"
 #include "lib/util.h"
+#include "lib/warnings.h"
 #include <dcp/certificate_chain.h>
 #include <dcp/exceptions.h>
 #include <dcp/locale_convert.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/filepicker.h>
 #include <wx/preferences.h>
 #include <wx/spinctrl.h>
 #include <wx/stdpaths.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <RtAudio.h>
 #include <boost/filesystem.hpp>
 #include <iostream>

diff --git a/src/wx/full_language_tag_dialog.cc b/src/wx/full_language_tag_dialog.cc
index df9a565b4d89c60a74b843fa644a81b5ca75ef93..19e52ff140eb813f758fb6bfbdc52be1e52c3adc 100644 (file)
--- a/src/wx/full_language_tag_dialog.cc
+++ b/src/wx/full_language_tag_dialog.cc
@@ -21,10 +21,13 @@
 
 #include "full_language_tag_dialog.h"
 #include "lib/dcpomatic_assert.h"
+#include "lib/warnings.h"
 #include <dcp/language_tag.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/listctrl.h>
 #include <wx/srchctrl.h>
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/algorithm/string.hpp>
 #include <boost/bind/bind.hpp>
 #include <boost/optional.hpp>

diff --git a/src/wx/gain_calculator_dialog.h b/src/wx/gain_calculator_dialog.h
index addc07288e1986edb803b20b1a3b4c8b040ab796..41312cdca1519b4f814e99033fc6b90ae28ede60 100644 (file)
--- a/src/wx/gain_calculator_dialog.h
+++ b/src/wx/gain_calculator_dialog.h
@@ -18,10 +18,15 @@
 
 */
 
+
 #include "table_dialog.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/optional.hpp>
 
+
 class GainCalculatorDialog : public TableDialog
 {
 public:

diff --git a/src/wx/i18n_hook.cc b/src/wx/i18n_hook.cc
index f6b9636227f4a33196cc7453c87708ce27a23674..15b9c1024c322bf731a39cba86b085a3647400ae 100644 (file)
--- a/src/wx/i18n_hook.cc
+++ b/src/wx/i18n_hook.cc
@@ -23,7 +23,10 @@
 #include "instant_i18n_dialog.h"
 #include "wx_util.h"
 #include "lib/cross.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/bind/bind.hpp>
 
 

diff --git a/src/wx/image_sequence_dialog.h b/src/wx/image_sequence_dialog.h
index 65d1cb922bbed968aec689ce98ac39e7c46555e8..1a7ae5de796f3255649f6139358288e90f7f4729 100644 (file)
--- a/src/wx/image_sequence_dialog.h
+++ b/src/wx/image_sequence_dialog.h
@@ -18,8 +18,13 @@
 
 */
 
-#include <wx/wx.h>
+
 #include "table_dialog.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
+#include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
+
 
 class ImageSequenceDialog : public TableDialog
 {

diff --git a/src/wx/interop_metadata_dialog.cc b/src/wx/interop_metadata_dialog.cc
index ad932bc67cab5eba56789efe5f01231d59360de4..08626c0ed7707d9390c5b14c8770381889e93d16 100644 (file)
--- a/src/wx/interop_metadata_dialog.cc
+++ b/src/wx/interop_metadata_dialog.cc
@@ -24,8 +24,11 @@
 #include "language_tag_widget.h"
 #include "rating_dialog.h"
 #include "lib/film.h"
+#include "lib/warnings.h"
 #include <dcp/types.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/gbsizer.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::shared_ptr;

diff --git a/src/wx/interop_metadata_dialog.h b/src/wx/interop_metadata_dialog.h
index b730c12381e85868f877fd77bb417f8884fb297e..fc1f9381dc7e5d5a1fc1edffda4f1c33c8553710 100644 (file)
--- a/src/wx/interop_metadata_dialog.h
+++ b/src/wx/interop_metadata_dialog.h
@@ -21,9 +21,12 @@
 
 #include "editable_list.h"
 #include "metadata_dialog.h"
+#include "lib/warnings.h"
 #include <dcp/language_tag.h>
 #include <dcp/types.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <vector>
 
 

diff --git a/src/wx/job_view.cc b/src/wx/job_view.cc
index fe42f4be36f6f6f911c8b01a558c2d228f111622..d4243cfb1128478ebb2a8f4e8c190bb2fbd43c00 100644 (file)
--- a/src/wx/job_view.cc
+++ b/src/wx/job_view.cc
@@ -32,7 +32,10 @@
 #include "lib/job_manager.h"
 #include "lib/send_notification_email_job.h"
 #include "lib/transcode_job.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/algorithm/string.hpp>
 
 

diff --git a/src/wx/kdm_advanced_dialog.cc b/src/wx/kdm_advanced_dialog.cc
index ba1e7a4d3ec341f3c8e9be0cf6a3913794d8be5d..1ae145e664a58c9358947ab6979f848e3b47e02f 100644 (file)
--- a/src/wx/kdm_advanced_dialog.cc
+++ b/src/wx/kdm_advanced_dialog.cc
@@ -22,7 +22,10 @@
 #include "check_box.h"
 #include "kdm_advanced_dialog.h"
 #include "wx_util.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/spinctrl.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using boost::optional;

diff --git a/src/wx/kdm_choice.h b/src/wx/kdm_choice.h
index 109c552f087d3fc0468508cb9e663681aac06425..8b216924a23f04590fd08fe21c098175aa25be62 100644 (file)
--- a/src/wx/kdm_choice.h
+++ b/src/wx/kdm_choice.h
@@ -19,8 +19,11 @@
 */
 
 
+#include "lib/warnings.h"
 #include <dcp/types.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 class KDMChoice : public wxChoice

diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc
index 71556812264d81ea4029b6810f5d69c1ee942fdd..c7be1862256c3c79ba974a083fbbafdd78d53304 100644 (file)
--- a/src/wx/kdm_dialog.cc
+++ b/src/wx/kdm_dialog.cc
@@ -34,10 +34,13 @@
 #include "lib/job_manager.h"
 #include "lib/kdm_with_metadata.h"
 #include "lib/screen.h"
+#include "lib/warnings.h"
 #include <libcxml/cxml.h>
 #include <dcp/exceptions.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/listctrl.h>
 #include <wx/treectrl.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::exception;

diff --git a/src/wx/kdm_dialog.h b/src/wx/kdm_dialog.h
index 0c6076fb4c1e7d65802931a054be8cec50c70757..052c07f8130042f807208e504170f363d075903f 100644 (file)
--- a/src/wx/kdm_dialog.h
+++ b/src/wx/kdm_dialog.h
@@ -20,8 +20,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/date_time/posix_time/posix_time.hpp>
 #include <map>
 

diff --git a/src/wx/kdm_output_panel.h b/src/wx/kdm_output_panel.h
index 37cca30de06af3f5b3bf173b0e1527179cef9e8b..829b26544a679bc8a303b752e21965da7bf180ba 100644 (file)
--- a/src/wx/kdm_output_panel.h
+++ b/src/wx/kdm_output_panel.h
@@ -19,10 +19,13 @@
 */
 
 
-#include "lib/kdm_with_metadata.h"
 #include "wx_util.h"
+#include "lib/kdm_with_metadata.h"
+#include "lib/warnings.h"
 #include <dcp/types.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 
 

diff --git a/src/wx/language_tag_dialog.cc b/src/wx/language_tag_dialog.cc
index ca08996c681d01a5d2c47b24ecbfd9000948316b..91ac3512dfa96a1fb0d993d89e6cf53389a10a27 100644 (file)
--- a/src/wx/language_tag_dialog.cc
+++ b/src/wx/language_tag_dialog.cc
@@ -23,8 +23,11 @@
 #include "language_tag_dialog.h"
 #include "wx_util.h"
 #include "lib/config.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/listctrl.h>
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <dcp/language_tag.h>
 
 

diff --git a/src/wx/language_tag_dialog.h b/src/wx/language_tag_dialog.h
index ae6ea4ef7a1ca2e69f3e6992320db8168af5007f..0675ed88a247214bffbbd8c62f6d8bc54a524dfd 100644 (file)
--- a/src/wx/language_tag_dialog.h
+++ b/src/wx/language_tag_dialog.h
@@ -23,8 +23,11 @@
 #define DCPOMATIC_LANGUAGE_TAG_DIALOG_H
 
 
+#include "lib/warnings.h"
 #include <dcp/language_tag.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 class wxListCtrl;

diff --git a/src/wx/language_tag_widget.cc b/src/wx/language_tag_widget.cc
index f0766c9d659832102265ba6d8f57c7d4156d26c1..3df2b6914a7963e5ccded2e21a2adb7fc93f8eed 100644 (file)
--- a/src/wx/language_tag_widget.cc
+++ b/src/wx/language_tag_widget.cc
@@ -23,7 +23,10 @@
 #include "language_tag_dialog.h"
 #include "language_tag_widget.h"
 #include "wx_util.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using boost::optional;

diff --git a/src/wx/language_tag_widget.h b/src/wx/language_tag_widget.h
index 16c00e3a63cc1fc0186a37a10a1781456bd43def..422c97918c876df4a570f8794a461d23344aa53e 100644 (file)
--- a/src/wx/language_tag_widget.h
+++ b/src/wx/language_tag_widget.h
@@ -19,8 +19,11 @@
 */
 
 
+#include "lib/warnings.h"
 #include <dcp/language_tag.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 

diff --git a/src/wx/markers_dialog.cc b/src/wx/markers_dialog.cc
index 302717f5953d3f68e6a2a0bbbe20e2bc9694fd47..5d66116914247ab6b59d46b8b5e241a2a4718ce4 100644 (file)
--- a/src/wx/markers_dialog.cc
+++ b/src/wx/markers_dialog.cc
@@ -27,8 +27,11 @@
 #include "timecode.h"
 #include "wx_util.h"
 #include "lib/film.h"
+#include "lib/warnings.h"
 #include <dcp/types.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/gbsizer.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/bind/bind.hpp>
 
 

diff --git a/src/wx/metadata_dialog.cc b/src/wx/metadata_dialog.cc
index 84b9d2898b30db9a41f542e455400f065d744424..a06a3f7fc42939f5919843fbe579ab02e507114d 100644 (file)
--- a/src/wx/metadata_dialog.cc
+++ b/src/wx/metadata_dialog.cc
@@ -25,11 +25,14 @@
 #include "metadata_dialog.h"
 #include "wx_util.h"
 #include "lib/film.h"
+#include "lib/warnings.h"
 #include <boost/bind.hpp>
 #include <boost/weak_ptr.hpp>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/notebook.h>
 #include <wx/spinctrl.h>
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::weak_ptr;

diff --git a/src/wx/move_to_dialog.cc b/src/wx/move_to_dialog.cc
index fdd118520999b50a67367d9f637ec6180aefe24f..db62297119ce28b7794552d295c781292de3d15a 100644 (file)
--- a/src/wx/move_to_dialog.cc
+++ b/src/wx/move_to_dialog.cc
@@ -21,7 +21,10 @@
 
 #include "move_to_dialog.h"
 #include "lib/film.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/spinctrl.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::list;

diff --git a/src/wx/normal_job_view.cc b/src/wx/normal_job_view.cc
index 6d2b7e9f207b3386e3a2633be4aa4b3bc6d1b609..9d29efd578a8f313e28412e3b7e030dc7d624002 100644 (file)
--- a/src/wx/normal_job_view.cc
+++ b/src/wx/normal_job_view.cc
@@ -19,10 +19,13 @@
 */
 
 
-#include "normal_job_view.h"
 #include "dcpomatic_button.h"
+#include "normal_job_view.h"
 #include "lib/job.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::shared_ptr;

diff --git a/src/wx/player_config_dialog.cc b/src/wx/player_config_dialog.cc
index 947afa500dcb9ed529c14f7cba11d687ac815de4..8cedd12e5fe84af5a7590921c5e262437702dd00 100644 (file)
--- a/src/wx/player_config_dialog.cc
+++ b/src/wx/player_config_dialog.cc
@@ -45,13 +45,16 @@
 #include "lib/log.h"
 #include "lib/ratio.h"
 #include "lib/util.h"
+#include "lib/warnings.h"
 #include <dcp/certificate_chain.h>
 #include <dcp/exceptions.h>
 #include <dcp/locale_convert.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/filepicker.h>
 #include <wx/preferences.h>
 #include <wx/spinctrl.h>
 #include <wx/stdpaths.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <RtAudio.h>
 #include <boost/filesystem.hpp>
 

diff --git a/src/wx/player_stress_tester.cc b/src/wx/player_stress_tester.cc
index b299ccbf8a249f9c674ba814c118a2ebe45ccccd..0b5889c37a294bc117465b9bb8f8c9ea1be0f4b0 100644 (file)
--- a/src/wx/player_stress_tester.cc
+++ b/src/wx/player_stress_tester.cc
@@ -21,9 +21,12 @@
 
 #include "controls.h"
 #include "player_stress_tester.h"
+#include "lib/warnings.h"
 #include <dcp/raw_convert.h>
 #include <dcp/util.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/algorithm/string.hpp>
 #include <boost/bind/bind.hpp>
 #include <iostream>

diff --git a/src/wx/playlist_controls.cc b/src/wx/playlist_controls.cc
index da7976b8d7259be1223568b516e2b47102bc39ad..7ed5c44952a92a7c61710c9c6e1701d0889609bc 100644 (file)
--- a/src/wx/playlist_controls.cc
+++ b/src/wx/playlist_controls.cc
@@ -32,10 +32,13 @@
 #include "lib/internet.h"
 #include "lib/player_video.h"
 #include "lib/scoped_temporary.h"
+#include "lib/warnings.h"
 #include <dcp/raw_convert.h>
 #include <dcp/exceptions.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/listctrl.h>
 #include <wx/progdlg.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::cout;

diff --git a/src/wx/rating_dialog.cc b/src/wx/rating_dialog.cc
index 9f64c2c660fdec32dbd26163d7ee1a6059f20417..22d10813b4917db7d0beab06f7c8b6fd7dd02c42 100644 (file)
--- a/src/wx/rating_dialog.cc
+++ b/src/wx/rating_dialog.cc
@@ -22,10 +22,13 @@
 #include "dcpomatic_spin_ctrl.h"
 #include "rating_dialog.h"
 #include "wx_util.h"
+#include "lib/warnings.h"
 #include <unicode/unistr.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/listctrl.h>
 #include <wx/notebook.h>
 #include <wx/srchctrl.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::string;

diff --git a/src/wx/rating_dialog.h b/src/wx/rating_dialog.h
index 27887baa2386a2fc25cb744e1109d7561f5a4fcd..77deece79410eb4402276e8f689fc0c6f11ec395 100644 (file)
--- a/src/wx/rating_dialog.h
+++ b/src/wx/rating_dialog.h
@@ -19,8 +19,11 @@
 */
 
 
+#include "lib/warnings.h"
 #include <dcp/rating.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 

diff --git a/src/wx/recipient_dialog.h b/src/wx/recipient_dialog.h
index 3ad9789e98b2a6f07c7027269235735a6b3d2e56..a3de94d56da0778a8f43aa736f6597c6f20139b0 100644 (file)
--- a/src/wx/recipient_dialog.h
+++ b/src/wx/recipient_dialog.h
@@ -23,8 +23,11 @@
 #include "email_dialog.h"
 #include "wx_util.h"
 #include "lib/screen.h"
+#include "lib/warnings.h"
 #include <dcp/certificate.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/optional.hpp>
 
 

diff --git a/src/wx/recreate_chain_dialog.h b/src/wx/recreate_chain_dialog.h
index 10086be865a2166fe472242011c740e47db2ca3c..bef0e2de615a6e8ace0b0504e8c9807cd087f8cd 100644 (file)
--- a/src/wx/recreate_chain_dialog.h
+++ b/src/wx/recreate_chain_dialog.h
@@ -18,11 +18,16 @@
 
 */
 
+
 #include "question_dialog.h"
 #include "lib/config.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <list>
 
+
 class RecreateChainDialog : public QuestionDialog
 {
 public:

diff --git a/src/wx/report_problem_dialog.cc b/src/wx/report_problem_dialog.cc
index 13ddb0539f31f86f50de4b9b67db73c04cda2c15..52c1e70bed2ae63c3124a17fdef366b9b175da38 100644 (file)
--- a/src/wx/report_problem_dialog.cc
+++ b/src/wx/report_problem_dialog.cc
@@ -26,7 +26,10 @@
 #include "lib/config.h"
 #include "lib/job_manager.h"
 #include "lib/send_problem_report_job.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/sizer.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::make_shared;

diff --git a/src/wx/screen_dialog.h b/src/wx/screen_dialog.h
index fcb3fba5d651b00c6f1adb0c220cb24724efa051..7d315b5333286a9aebb1ab8e4258d501895616a6 100644 (file)
--- a/src/wx/screen_dialog.h
+++ b/src/wx/screen_dialog.h
@@ -21,8 +21,11 @@
 
 #include "editable_list.h"
 #include "lib/screen.h"
+#include "lib/warnings.h"
 #include <dcp/certificate.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/optional.hpp>
 
 

diff --git a/src/wx/screens_panel.h b/src/wx/screens_panel.h
index 1eff50a59b21833f5a33b4a0ce8bdc3007ce271d..f19aef68000ac08b34526945ee1851c18fe7f9c8 100644 (file)
--- a/src/wx/screens_panel.h
+++ b/src/wx/screens_panel.h
@@ -21,10 +21,10 @@
 
 #include "lib/warnings.h"
 DCPOMATIC_DISABLE_WARNINGS
-#include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
 #include <wx/srchctrl.h>
 #include <wx/treelist.h>
+#include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 #include <list>
 #include <map>

diff --git a/src/wx/send_i18n_dialog.cc b/src/wx/send_i18n_dialog.cc
index 05cd87d44281fdbd1d18900901348eded428b381..6ce8f655852493c94da36bc16efe86649fbf78df 100644 (file)
--- a/src/wx/send_i18n_dialog.cc
+++ b/src/wx/send_i18n_dialog.cc
@@ -22,7 +22,10 @@
 #include "i18n_hook.h"
 #include "send_i18n_dialog.h"
 #include "wx_util.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/listctrl.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::string;

diff --git a/src/wx/send_i18n_dialog.h b/src/wx/send_i18n_dialog.h
index 68eec51b2b678cb0b8fd0d57cc876149d6b4231b..24884bd849b9a8c2c95d45a7b3c19c4a14227386 100644 (file)
--- a/src/wx/send_i18n_dialog.h
+++ b/src/wx/send_i18n_dialog.h
@@ -20,7 +20,10 @@
 
 
 #include "wx_util.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 class SendI18NDialog : public wxDialog

diff --git a/src/wx/simple_video_view.cc b/src/wx/simple_video_view.cc
index 8d5cb95f864a960a0e37f015d85c26610640f9e6..c6a4f1e74816cd8ec7c43bc5774677206e70adf2 100644 (file)
--- a/src/wx/simple_video_view.cc
+++ b/src/wx/simple_video_view.cc
@@ -26,8 +26,11 @@
 #include "lib/butler.h"
 #include "lib/dcpomatic_log.h"
 #include "lib/image.h"
+#include "lib/warnings.h"
 #include <dcp/util.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/bind/bind.hpp>
 
 

diff --git a/src/wx/smpte_metadata_dialog.cc b/src/wx/smpte_metadata_dialog.cc
index 979afde8d607c95d47681cbd01c48ef9d06cbac1..0f8929cb1d5c09a125853a7692969190438df432 100644 (file)
--- a/src/wx/smpte_metadata_dialog.cc
+++ b/src/wx/smpte_metadata_dialog.cc
@@ -26,9 +26,12 @@
 #include "rating_dialog.h"
 #include "smpte_metadata_dialog.h"
 #include "lib/film.h"
+#include "lib/warnings.h"
 #include <dcp/types.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/gbsizer.h>
 #include <wx/spinctrl.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::shared_ptr;

diff --git a/src/wx/smpte_metadata_dialog.h b/src/wx/smpte_metadata_dialog.h
index 2d1b3075703de2d1b8dddb9aa323311be61328a5..ee2a9f47c9477c5dc47c2309f335348cd5e7c570 100644 (file)
--- a/src/wx/smpte_metadata_dialog.h
+++ b/src/wx/smpte_metadata_dialog.h
@@ -24,9 +24,12 @@
 #include "metadata_dialog.h"
 #include "lib/film.h"
 #include "lib/weak_film.h"
+#include "lib/warnings.h"
 #include <dcp/language_tag.h>
 #include <dcp/types.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <vector>
 
 

diff --git a/src/wx/standard_controls.cc b/src/wx/standard_controls.cc
index 6196c1b5c29e10c39fcb55277a7e833116d7cf3c..cef06d29cf695c1af92e8e9e1255b2fc7ac2b2f0 100644 (file)
--- a/src/wx/standard_controls.cc
+++ b/src/wx/standard_controls.cc
@@ -21,8 +21,11 @@
 
 #include "film_viewer.h"
 #include "standard_controls.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/tglbtn.h>
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::shared_ptr;

diff --git a/src/wx/static_text.h b/src/wx/static_text.h
index f690815eb08d21ff6a7531d988299f6a141b50fb..bb9ee612c5708b6e273efca4a64b89ae26bfe8a4 100644 (file)
--- a/src/wx/static_text.h
+++ b/src/wx/static_text.h
@@ -20,7 +20,10 @@
 
 
 #include "i18n_hook.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 class StaticText : public wxStaticText, public I18NHook

diff --git a/src/wx/system_font_dialog.cc b/src/wx/system_font_dialog.cc
index df5b8e21b647a531ec2914592f0079876f4c0cdc..6b0a650c7ac426819ad2076122bf16eae1700cb1 100644 (file)
--- a/src/wx/system_font_dialog.cc
+++ b/src/wx/system_font_dialog.cc
@@ -21,7 +21,10 @@
 
 #include "system_font_dialog.h"
 #include "wx_util.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/listctrl.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 #include <iostream>
 

diff --git a/src/wx/templates_dialog.cc b/src/wx/templates_dialog.cc
index 30c692e5e3cf75c62cc3ad9e6a6a9a1be1e85372..5173cdc5a2557921c03476ad832e6d46cee82fc1 100644 (file)
--- a/src/wx/templates_dialog.cc
+++ b/src/wx/templates_dialog.cc
@@ -24,7 +24,10 @@
 #include "templates_dialog.h"
 #include "wx_util.h"
 #include "lib/config.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::string;

diff --git a/src/wx/text_panel.cc b/src/wx/text_panel.cc
index 24646b78ac56704e1ee3636ff39a5ffcdac6d7c4..a841d1654db52f9175f8b2263a9b125c7b9e57aa 100644 (file)
--- a/src/wx/text_panel.cc
+++ b/src/wx/text_panel.cc
@@ -45,7 +45,10 @@
 #include "lib/string_text_file_decoder.h"
 #include "lib/subtitle_analysis.h"
 #include "lib/text_content.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/spinctrl.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::cout;

diff --git a/src/wx/text_view.h b/src/wx/text_view.h
index b44742b6313afeeb524454f59577fbdc4e8f0700..24641b2ab856d9d7b89f8e502fe32cceee477091 100644 (file)
--- a/src/wx/text_view.h
+++ b/src/wx/text_view.h
@@ -21,9 +21,9 @@
 #include "lib/content_text.h"
 #include "lib/warnings.h"
 DCPOMATIC_DISABLE_WARNINGS
+#include <wx/listctrl.h>
 #include <wx/wx.h>
 DCPOMATIC_ENABLE_WARNINGS
-#include <wx/listctrl.h>
 
 class Decoder;
 class FilmViewer;

diff --git a/src/wx/time_picker.cc b/src/wx/time_picker.cc
index 6b37d864b2592c35d12b013c0173c75ec94448db..614ea94240f9a0b56d58d6082dac8fe847dcb240 100644 (file)
--- a/src/wx/time_picker.cc
+++ b/src/wx/time_picker.cc
@@ -22,8 +22,11 @@
 #include "static_text.h"
 #include "time_picker.h"
 #include "wx_util.h"
+#include "lib/warnings.h"
 #include <dcp/locale_convert.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/spinctrl.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/bind/bind.hpp>
 #include <iomanip>
 

diff --git a/src/wx/timecode.h b/src/wx/timecode.h
index 84ef5cc1ba2bdae4da4af268d4728617d652eee6..529cc2943b4f03bbbae694dcdf993ed834ee553e 100644 (file)
--- a/src/wx/timecode.h
+++ b/src/wx/timecode.h
@@ -26,8 +26,11 @@
 #include "wx_util.h"
 #include "lib/dcpomatic_time.h"
 #include "lib/types.h"
+#include "lib/warnings.h"
 #include <dcp/raw_convert.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 

diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index 645cb3de3a5e876055177e8126894721e2b1e142..b39a8aebef53319622d17a8efb88cd1ebffe4dbf 100644 (file)
--- a/src/wx/timeline.cc
+++ b/src/wx/timeline.cc
@@ -38,7 +38,10 @@
 #include "lib/text_content.h"
 #include "lib/timer.h"
 #include "lib/video_content.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/graphics.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <iterator>
 #include <list>
 

diff --git a/src/wx/timeline_content_view.cc b/src/wx/timeline_content_view.cc
index 926ca3258c0b3947bdafdc4cf1644d149a0b3dfd..79c87f7e000532ce55849bb248cba69a0294efaa 100644 (file)
--- a/src/wx/timeline_content_view.cc
+++ b/src/wx/timeline_content_view.cc
@@ -23,7 +23,10 @@
 #include "timeline_content_view.h"
 #include "wx_util.h"
 #include "lib/content.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/graphics.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::list;

diff --git a/src/wx/timeline_dialog.cc b/src/wx/timeline_dialog.cc
index 8cdc6d63d5cf52282534630055d92733c6fa12a1..07295d46a582a3a21acb172529562687da65e9d2 100644 (file)
--- a/src/wx/timeline_dialog.cc
+++ b/src/wx/timeline_dialog.cc
@@ -26,7 +26,10 @@
 #include "lib/compose.hpp"
 #include "lib/cross.h"
 #include "lib/playlist.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/graphics.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <list>
 
 

diff --git a/src/wx/timeline_dialog.h b/src/wx/timeline_dialog.h
index 17128e108b1d2640112b06ae26a8f557d49677ba..04fc52aa10ab0fd376fe27c0712b150c776b5158 100644 (file)
--- a/src/wx/timeline_dialog.h
+++ b/src/wx/timeline_dialog.h
@@ -19,8 +19,11 @@
 */
 
 
-#include <wx/wx.h>
 #include "timeline.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
+#include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 class Playlist;

diff --git a/src/wx/timeline_labels_view.cc b/src/wx/timeline_labels_view.cc
index cc0d76aa7ab5a73d670ac50d4ce2a7f20cffac86..413fed843cda042381bb02eb35252a1b050ada38 100644 (file)
--- a/src/wx/timeline_labels_view.cc
+++ b/src/wx/timeline_labels_view.cc
@@ -21,8 +21,11 @@
 
 #include "timeline.h"
 #include "timeline_labels_view.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/graphics.h>
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::list;

diff --git a/src/wx/timeline_reels_view.cc b/src/wx/timeline_reels_view.cc
index 588ae781902ae7f851857e540c43bd18c68f2911..22aa998dc96032e34de471b1661877f500dce9b7 100644 (file)
--- a/src/wx/timeline_reels_view.cc
+++ b/src/wx/timeline_reels_view.cc
@@ -21,8 +21,10 @@
 
 #include "timeline.h"
 #include "timeline_reels_view.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/graphics.h>
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::min;

diff --git a/src/wx/timeline_time_axis_view.cc b/src/wx/timeline_time_axis_view.cc
index 3cdcfc2c85604bd283ae025d8b9d2975695d300f..046ddaf3f2b301f7f4495cc2dd18e7d451465d34 100644 (file)
--- a/src/wx/timeline_time_axis_view.cc
+++ b/src/wx/timeline_time_axis_view.cc
@@ -21,8 +21,11 @@
 #include "timeline.h"
 #include "timeline_time_axis_view.h"
 #include "wx_util.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/graphics.h>
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::cout;

diff --git a/src/wx/try_unmount_dialog.cc b/src/wx/try_unmount_dialog.cc
index dcec6bb0b644fa351271715727e97743282b7ee2..93ebc624046f401bc5586f448b28ea028556fa60 100644 (file)
--- a/src/wx/try_unmount_dialog.cc
+++ b/src/wx/try_unmount_dialog.cc
@@ -22,7 +22,10 @@
 #include "static_text.h"
 #include "try_unmount_dialog.h"
 #include "wx_util.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 static int constexpr width = 300;

diff --git a/src/wx/verify_dcp_progress_dialog.cc b/src/wx/verify_dcp_progress_dialog.cc
index c62d198a0d85f0ef2628d11b6de2f4dd8ace898f..320510c600adf89a0272e35184088822807673bb 100644 (file)
--- a/src/wx/verify_dcp_progress_dialog.cc
+++ b/src/wx/verify_dcp_progress_dialog.cc
@@ -24,7 +24,10 @@
 #include "lib/cross.h"
 #include "lib/job.h"
 #include "lib/job_manager.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/evtloop.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <string>
 
 

diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index ff249a7acd386a7f34b6c1258aecb88cae820bd7..74b2d22192925be9df1447d9ff77bbd80f5f1095 100644 (file)
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -38,8 +38,11 @@
 #include "lib/ratio.h"
 #include "lib/util.h"
 #include "lib/video_content.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/spinctrl.h>
 #include <wx/tglbtn.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/functional/hash.hpp>
 #include <boost/unordered_set.hpp>
 #include <set>

diff --git a/src/wx/video_view.h b/src/wx/video_view.h
index 28ca3a1e8c4a7ce6bf3da3aba260dc9db0d98b75..cf5e09da0a8ff9444a05839cc6bce12ad4cbe5f9 100644 (file)
--- a/src/wx/video_view.h
+++ b/src/wx/video_view.h
@@ -28,7 +28,10 @@
 #include "lib/signaller.h"
 #include "lib/timer.h"
 #include "lib/types.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 #include <boost/thread.hpp>
 

diff --git a/src/wx/video_waveform_plot.cc b/src/wx/video_waveform_plot.cc
index 766432ec6a0c608ae97b83059c6990dab73c01ea..f45a5662e9fee87c072952e8864fcad362c5b382 100644 (file)
--- a/src/wx/video_waveform_plot.cc
+++ b/src/wx/video_waveform_plot.cc
@@ -26,10 +26,13 @@
 #include "lib/film.h"
 #include "lib/image.h"
 #include "lib/player_video.h"
+#include "lib/warnings.h"
 #include <dcp/locale_convert.h>
 #include <dcp/openjpeg_image.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/graphics.h>
 #include <wx/rawbmp.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/bind/bind.hpp>
 #include <iostream>
 

diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h
index a41337720082b94b0aedaaaf4b5fa5ef62a92c81..06e3eda0f1b447d090c7d6350c55463a3b928f2a 100644 (file)
--- a/src/wx/wx_util.h
+++ b/src/wx/wx_util.h
@@ -31,9 +31,9 @@
 #include "lib/dcpomatic_time.h"
 #include "lib/warnings.h"
 DCPOMATIC_DISABLE_WARNINGS
+#include <wx/gbsizer.h>
 #include <wx/wx.h>
 DCPOMATIC_ENABLE_WARNINGS
-#include <wx/gbsizer.h>
 #include <boost/signals2.hpp>
 #include <boost/thread.hpp>