From: Carl Hetherington <cth@carlh.net>
Date: Sun, 26 Jul 2020 00:27:48 +0000 (+0200)
Subject: Ignore wxWidgets warnings in a nicer way.
X-Git-Tag: v2.15.91~8^2~16
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=94ace8e9fb2cbcf6f849edefd6b5e4c4a2d3ed7f

Ignore wxWidgets warnings in a nicer way.
---

diff --git a/src/wx/dir_picker_ctrl.h b/src/wx/dir_picker_ctrl.h
index f23609659..83fe57a17 100644
--- a/src/wx/dir_picker_ctrl.h
+++ b/src/wx/dir_picker_ctrl.h
@@ -21,7 +21,10 @@
 #ifndef DCPOMATIC_DIR_PICKER_CTRL
 #define DCPOMATIC_DIR_PICKER_CTRL
 
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 class DirPickerCtrl : public wxPanel
 {
diff --git a/src/wx/download_certificate_panel.h b/src/wx/download_certificate_panel.h
index 2ad03f7c0..ba355f813 100644
--- a/src/wx/download_certificate_panel.h
+++ b/src/wx/download_certificate_panel.h
@@ -21,8 +21,11 @@
 #ifndef DCPOMATIC_DOWNLOAD_CERTIFICATE_PANEL_H
 #define DCPOMATIC_DOWNLOAD_CERTIFICATE_PANEL_H
 
+#include "lib/warnings.h"
 #include <dcp/certificate.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/optional.hpp>
 
 class DownloadCertificateDialog;
diff --git a/src/wx/drive_wipe_warning_dialog.h b/src/wx/drive_wipe_warning_dialog.h
index 1043e7f1b..71a21b55f 100644
--- a/src/wx/drive_wipe_warning_dialog.h
+++ b/src/wx/drive_wipe_warning_dialog.h
@@ -18,7 +18,10 @@
 
 */
 
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 class DriveWipeWarningDialog : public wxDialog
 {
diff --git a/src/wx/file_picker_ctrl.h b/src/wx/file_picker_ctrl.h
index b30288fa7..60858b665 100644
--- a/src/wx/file_picker_ctrl.h
+++ b/src/wx/file_picker_ctrl.h
@@ -18,7 +18,10 @@
 
 */
 
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 class FilePickerCtrl : public wxPanel
 {
diff --git a/src/wx/i18n_hook.h b/src/wx/i18n_hook.h
index 40fd89a2c..b2de66172 100644
--- a/src/wx/i18n_hook.h
+++ b/src/wx/i18n_hook.h
@@ -21,7 +21,10 @@
 #ifndef DCPOMATIC_I18N_HOOK_H
 #define DCPOMATIC_I18N_HOOK_H
 
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <map>
 
 class I18NHook
diff --git a/src/wx/message_dialog.h b/src/wx/message_dialog.h
index 0f625907c..8ef43cf9a 100644
--- a/src/wx/message_dialog.h
+++ b/src/wx/message_dialog.h
@@ -18,7 +18,10 @@
 
 */
 
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 class MessageDialog : public wxDialog
 {
diff --git a/src/wx/table_dialog.h b/src/wx/table_dialog.h
index a5015ee59..fdc2022c8 100644
--- a/src/wx/table_dialog.h
+++ b/src/wx/table_dialog.h
@@ -21,7 +21,10 @@
 #ifndef DCPOMATIC_TABLE_DIALOG_H
 #define DCPOMATIC_TABLE_DIALOG_H
 
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 class TableDialog : public wxDialog
 {
diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h
index af938b670..294c661a8 100644
--- a/src/wx/wx_util.h
+++ b/src/wx/wx_util.h
@@ -26,7 +26,10 @@
 #define DCPOMATIC_WX_UTIL_H
 
 #include "lib/dcpomatic_time.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <wx/gbsizer.h>
 #include <boost/function.hpp>
 #include <boost/thread.hpp>