Ignore wxWidgets warnings in a nicer way.

diff --git a/src/wx/dir_picker_ctrl.h b/src/wx/dir_picker_ctrl.h
index f236096598ce07dfbb998fd950b3bda645803a9c..83fe57a170310dcf9e90928be3e73cf0b2a068c4 100644 (file)
--- 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 2ad03f7c0c96d1a00a82d8844684b8a52bc0b53c..ba355f8138c30c3c4aa46ecace7f75a7dc3fbf3d 100644 (file)
--- 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 1043e7f1bf579985bf315abd7d8104f55e9f7a82..71a21b55f2408d312e442641d785a0418c96d4e2 100644 (file)
--- 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 b30288fa74826ec7d90994b037d1157d78fbfc0a..60858b665da55983d1a06fe83e9139dc53126833 100644 (file)
--- 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 40fd89a2c66cce72ecaed2701c7a47afbbad450d..b2de66172b0971fbee2c05c3aa9e2f786273eed9 100644 (file)
--- 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 0f625907cc656f2509ae9588645c66fa8db99097..8ef43cf9a7ba7c28f90fd4057d6a048953255c89 100644 (file)
--- 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 a5015ee59c02f4921233922455a5e774b5fbce38..fdc2022c84f6a39033f54794ecd09927d1cf35f1 100644 (file)
--- 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 af938b670f54121b9d478fe9f4546c3a69d370e7..294c661a87dbed0fe88d59519f16cd872c0e0e7c 100644 (file)
--- 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>