From 45598f8ef84d67034950e5bb068c52066484f8be Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Wed, 12 Feb 2020 12:11:53 +0100
Subject: [PATCH] Suppress wxWidgets code analysis warnings

Rather than addressing numerous code analysis warnings Microsoft Visual
Studio 2019 reports for wxWidgets upstream, disable code analysis for
the time being. But only for the wxWidgets part. We still want to know
what the code analysis has to say about our code.

Signed-off-by: Simon Rozman <simon@rozman.si>
---
 include/wxex/appbar.h             | 4 ++++
 include/wxex/aui/framemanager.h   | 4 ++++
 include/wxex/common.h             | 9 +++++++++
 include/wxex/crypto.h             | 4 ++++
 include/wxex/hex.h                | 8 ++++++--
 include/wxex/object.h             | 4 ++++
 include/wxex/persist/auimanager.h | 4 ++++
 include/wxex/persist/toplevel.h   | 4 ++++
 include/wxex/private/tlwgeom.h    | 4 ++++
 include/wxex/url.h                | 8 ++++++--
 include/wxex/valhex.h             | 4 ++++
 include/wxex/valnet.h             | 4 ++++
 include/wxex/xml.h                | 4 ++++
 src/pch.h                         | 4 ++++
 14 files changed, 65 insertions(+), 4 deletions(-)

diff --git a/include/wxex/appbar.h b/include/wxex/appbar.h
index a8dcd3c..6152ee9 100644
--- a/include/wxex/appbar.h
+++ b/include/wxex/appbar.h
@@ -23,9 +23,13 @@
 
 #include "common.h"
 
+#include <codeanalysis\warnings.h>
+#pragma warning(push)
+#pragma warning(disable: WXWIDGETS_CODE_ANALYSIS_WARNINGS)
 #include <wx/dialog.h>
 #include <wx/frame.h>
 #include <wx/string.h>
+#pragma warning(pop)
 
 #include <Windows.h>
 #include <Windowsx.h>
diff --git a/include/wxex/aui/framemanager.h b/include/wxex/aui/framemanager.h
index ea5410b..151094d 100644
--- a/include/wxex/aui/framemanager.h
+++ b/include/wxex/aui/framemanager.h
@@ -22,8 +22,12 @@
 
 #include "../common.h"
 
+#include <codeanalysis\warnings.h>
+#pragma warning(push)
+#pragma warning(disable: WXWIDGETS_CODE_ANALYSIS_WARNINGS)
 #include <wx/aui/framemanager.h>
 #include <wx/string.h>
+#pragma warning(pop)
 
 /// \addtogroup wxExtend
 /// @{
diff --git a/include/wxex/common.h b/include/wxex/common.h
index f4c824c..45ae02f 100644
--- a/include/wxex/common.h
+++ b/include/wxex/common.h
@@ -43,10 +43,19 @@
 #if !defined(RC_INVOKED) && !defined(MIDL_PASS)
 
 #include <Windows.h>
+
+#include <codeanalysis\warnings.h>
+#ifndef WXWIDGETS_CODE_ANALYSIS_WARNINGS
+#define WXWIDGETS_CODE_ANALYSIS_WARNINGS ALL_CODE_ANALYSIS_WARNINGS 26812
+#endif
+
+#pragma warning(push)
+#pragma warning(disable: WXWIDGETS_CODE_ANALYSIS_WARNINGS)
 #include <wx/config.h>
 #include <wx/debug.h>
 #include <wx/defs.h>
 #include <wx/intl.h>
+#pragma warning(pop)
 
 ///
 /// Public function calling convention
diff --git a/include/wxex/crypto.h b/include/wxex/crypto.h
index 35ef1b7..2b558e1 100644
--- a/include/wxex/crypto.h
+++ b/include/wxex/crypto.h
@@ -22,10 +22,14 @@
 
 #include "common.h"
 
+#include <codeanalysis\warnings.h>
+#pragma warning(push)
+#pragma warning(disable: WXWIDGETS_CODE_ANALYSIS_WARNINGS)
 #include <wx/buffer.h>
 #include <wx/ffile.h>
 #include <wx/log.h>
 #include <wx/string.h>
+#pragma warning(pop)
 
 #include <Wincrypt.h>
 
diff --git a/include/wxex/hex.h b/include/wxex/hex.h
index 00e61c5..6f61982 100644
--- a/include/wxex/hex.h
+++ b/include/wxex/hex.h
@@ -22,8 +22,12 @@
 
 #include "common.h"
 
-#include "wx/string.h"
-#include "wx/buffer.h"
+#include <codeanalysis\warnings.h>
+#pragma warning(push)
+#pragma warning(disable: WXWIDGETS_CODE_ANALYSIS_WARNINGS)
+#include <wx/string.h>
+#include <wx/buffer.h>
+#pragma warning(pop)
 
 
 // ----------------------------------------------------------------------------
diff --git a/include/wxex/object.h b/include/wxex/object.h
index a06e676..74d1530 100644
--- a/include/wxex/object.h
+++ b/include/wxex/object.h
@@ -22,7 +22,11 @@
 
 #include "common.h"
 
+#include <codeanalysis\warnings.h>
+#pragma warning(push)
+#pragma warning(disable: WXWIDGETS_CODE_ANALYSIS_WARNINGS)
 #include <wx/object.h>
+#pragma warning(pop)
 
 
 ///
diff --git a/include/wxex/persist/auimanager.h b/include/wxex/persist/auimanager.h
index 352becc..e966e63 100644
--- a/include/wxex/persist/auimanager.h
+++ b/include/wxex/persist/auimanager.h
@@ -24,8 +24,12 @@
 
 #include "../aui/framemanager.h"
 
+#include <codeanalysis\warnings.h>
+#pragma warning(push)
+#pragma warning(disable: WXWIDGETS_CODE_ANALYSIS_WARNINGS)
 #include <wx/persist.h>
 #include <wx/aui/framemanager.h>
+#pragma warning(pop)
 
 
 /// \addtogroup wxExtend
diff --git a/include/wxex/persist/toplevel.h b/include/wxex/persist/toplevel.h
index dbf2fa8..9b637d7 100644
--- a/include/wxex/persist/toplevel.h
+++ b/include/wxex/persist/toplevel.h
@@ -23,10 +23,14 @@
 #include "../common.h"
 #include "../private/tlwgeom.h"
 
+#include <codeanalysis\warnings.h>
+#pragma warning(push)
+#pragma warning(disable: WXWIDGETS_CODE_ANALYSIS_WARNINGS)
 #include <wx/persist.h>
 #include <wx/persist/toplevel.h>
 #include <wx/persist/window.h>
 #include <wx/toplevel.h>
+#pragma warning(pop)
 
 /// \addtogroup wxExtend
 /// @{
diff --git a/include/wxex/private/tlwgeom.h b/include/wxex/private/tlwgeom.h
index e042cf8..b92bcf1 100644
--- a/include/wxex/private/tlwgeom.h
+++ b/include/wxex/private/tlwgeom.h
@@ -20,8 +20,12 @@
 
 #pragma once
 
+#include <codeanalysis\warnings.h>
+#pragma warning(push)
+#pragma warning(disable: WXWIDGETS_CODE_ANALYSIS_WARNINGS)
 #include <wx/dynlib.h>
 #include <wx/private/tlwgeom.h>
+#pragma warning(pop)
 
 #ifndef USER_DEFAULT_SCREEN_DPI
 #define USER_DEFAULT_SCREEN_DPI 96
diff --git a/include/wxex/url.h b/include/wxex/url.h
index 9b0c1dc..346fe84 100644
--- a/include/wxex/url.h
+++ b/include/wxex/url.h
@@ -22,8 +22,12 @@
 
 #include "common.h"
 
-#include "wx/string.h"
-#include "wx/buffer.h"
+#include <codeanalysis\warnings.h>
+#pragma warning(push)
+#pragma warning(disable: WXWIDGETS_CODE_ANALYSIS_WARNINGS)
+#include <wx/string.h>
+#include <wx/buffer.h>
+#pragma warning(pop)
 
 /// \addtogroup wxExtend
 /// @{
diff --git a/include/wxex/valhex.h b/include/wxex/valhex.h
index f7f7067..04ee451 100644
--- a/include/wxex/valhex.h
+++ b/include/wxex/valhex.h
@@ -22,7 +22,11 @@
 
 #include "common.h"
 
+#include <codeanalysis\warnings.h>
+#pragma warning(push)
+#pragma warning(disable: WXWIDGETS_CODE_ANALYSIS_WARNINGS)
 #include <wx/valnum.h>
+#pragma warning(pop)
 
 /// \addtogroup wxExtend
 /// @{
diff --git a/include/wxex/valnet.h b/include/wxex/valnet.h
index 7d07675..a3a1f28 100644
--- a/include/wxex/valnet.h
+++ b/include/wxex/valnet.h
@@ -22,9 +22,13 @@
 
 #include "common.h"
 
+#include <codeanalysis\warnings.h>
+#pragma warning(push)
+#pragma warning(disable: WXWIDGETS_CODE_ANALYSIS_WARNINGS)
 #include <wx/arrstr.h>
 #include <wx/textctrl.h>
 #include <wx/validate.h>
+#pragma warning(pop)
 
 /// \addtogroup wxExtend
 /// @{
diff --git a/include/wxex/xml.h b/include/wxex/xml.h
index 1cbe69e..1ecfb6f 100644
--- a/include/wxex/xml.h
+++ b/include/wxex/xml.h
@@ -24,8 +24,12 @@
 
 #include "crypto.h"
 
+#include <codeanalysis\warnings.h>
+#pragma warning(push)
+#pragma warning(disable: WXWIDGETS_CODE_ANALYSIS_WARNINGS)
 #include <wx/string.h>
 #include <wx/xml/xml.h>
+#pragma warning(pop)
 
 /// \addtogroup wxExtend
 /// @{
diff --git a/src/pch.h b/src/pch.h
index 4c4ddf0..3b41de2 100644
--- a/src/pch.h
+++ b/src/pch.h
@@ -22,7 +22,11 @@
 
 // Since including <wx/app.h> introduces wrong include order in 3.0.2,
 // include the grand <wx/wx.h> at a cost of longer pre-compilation phase.
+#include <codeanalysis\warnings.h>
+#pragma warning(push)
+#pragma warning(disable: ALL_CODE_ANALYSIS_WARNINGS 26812)
 #include <wx/wx.h>
+#pragma warning(pop)
 
 #include "../include/wxex/aui/framemanager.h"