From 333a663c70c3e37b430b44dc830a975fdc9eee5e Mon Sep 17 00:00:00 2001
From: PB <pbfordev@gmail.com>
Date: Tue, 11 Oct 2022 18:17:12 +0200
Subject: [PATCH] Update MSVS debug visualisers

Remove autoexp.inc, this format is no longer supported by MSVC.

Merge wxWidgets.2013.natvis with wxWidgets.natvis.

Remove wxVector<> visualizer as it's not used any more and is just a
synonym for std::vector<> now.
---
 misc/msvc/autoexp.inc           | 16 ----------------
 misc/msvc/wxWidgets.2013.natvis | 16 ----------------
 misc/msvc/wxWidgets.natvis      | 26 +++++++++-----------------
 3 files changed, 9 insertions(+), 49 deletions(-)
 delete mode 100644 misc/msvc/autoexp.inc
 delete mode 100644 misc/msvc/wxWidgets.2013.natvis

diff --git a/misc/msvc/autoexp.inc b/misc/msvc/autoexp.inc
deleted file mode 100644
index d595951620..0000000000
--- a/misc/msvc/autoexp.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-; This is a fragment that is supposed to be pasted into your autoexp.dat file
-; found somewhere under MSVS installation directory (its exact location depends
-; MSVS version so the simplest thing to do is to just search for it there).
-
-[AutoExpand]
-wxPoint=<x>,<y>
-wxSize=<x>*<y>
-wxRect=<x>,<y> <width>*<height>
-
-wxLongLong=<m_ll>
-wxString=<m_impl>
-
-[Visualizer]
-wxDateTime{
-        preview  (#if ($e.IsValid()) ([wxDumpDate(&($e)),s]) #else (#("NIL")))
-}
diff --git a/misc/msvc/wxWidgets.2013.natvis b/misc/msvc/wxWidgets.2013.natvis
deleted file mode 100644
index 7dc5679223..0000000000
--- a/misc/msvc/wxWidgets.2013.natvis
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
-This file contains visualizers for Visual Studio 2013+ debugger.
-It should be copied into the %USERPROFILE%\My Documents\Visual Studio 2013\Visualizers
-directory (or the corresponding location for newer versions) in addition to
-wxWidgets.natvis which defines visualizers that also work with MSVS 2012.
-
-The new features in MSVS 2013 are described in details here:
-http://blogs.msdn.com/b/vcblog/archive/2013/06/28/using-visual-studio-2013-to-write-maintainable-native-visualizations-natvis.aspx
--->
-<AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
-    <Type Name="wxWindow">
-        <DisplayString>$(Type) HWND={m_hWnd,x}</DisplayString>
-    </Type>
-</AutoVisualizer>
diff --git a/misc/msvc/wxWidgets.natvis b/misc/msvc/wxWidgets.natvis
index ca15f7cdea..aae7cfcd06 100644
--- a/misc/msvc/wxWidgets.natvis
+++ b/misc/msvc/wxWidgets.natvis
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 
-This file contains visualizers for Visual Studio 2012+ debugger.
-It should be copied into the %USERPROFILE%\My Documents\Visual Studio 2012\Visualizers\
-directory (or the corresponding location for newer versions, e.g. ...2013\Visualizers).
+This file contains visualizers for Visual Studio debugger.
+It should be copied into the %USERPROFILE%\My Documents\Visual Studio 2015\Visualizers\
+directory (or the corresponding location for newer versions, e.g. ...2017\Visualizers).
+
+More information can be found at https://learn.microsoft.com/en-us/visualstudio/debugger/create-custom-views-of-native-objects
 
-Introductory reference for the format:
-http://blogs.msdn.com/b/vcblog/archive/2012/07/12/10329460.aspx
-http://code.msdn.microsoft.com/windowsdesktop/Writing-type-visualizers-2eae77a2#content
 -->
 <AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
     <!-- We want to avoid showing 'L' before the string, this is useless and
@@ -62,6 +61,10 @@ http://code.msdn.microsoft.com/windowsdesktop/Writing-type-visualizers-2eae77a2#
         </Expand>
     </Type>
 
+    <Type Name="wxWindow">
+        <DisplayString>$(Type) HWND={m_hWnd,x}</DisplayString>
+    </Type>
+
     <!--
         Defining visualizer for wxListBase is not really useful, so do it for
         the most commonly used "concrete" list type.
@@ -79,15 +82,4 @@ http://code.msdn.microsoft.com/windowsdesktop/Writing-type-visualizers-2eae77a2#
         </Expand>
     </Type>
 
-    <Type Name="wxVector&lt;*&gt;">
-        <DisplayString>size={m_size}</DisplayString>
-        <Expand>
-            <Item Name="[size]">m_size</Item>
-            <Item Name="[capacity]">m_capacity</Item>
-            <ArrayItems>
-                <Size>m_size</Size>
-                <ValuePointer>m_values</ValuePointer>
-            </ArrayItems>
-        </Expand>
-    </Type>
 </AutoVisualizer>