From be2fdb684dc07435857c5e94dcfe5b55afcff55d Mon Sep 17 00:00:00 2001
From: luca <luca@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Mon, 3 Dec 2007 16:59:31 +0000
Subject: [PATCH] Patch level         : Files correlati     : Ricompilazione
 Demo : [ ] Commento            :messo wx287

git-svn-id: svn://10.65.10.50/trunk@15831 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 projects/770.vcproj     |  4 ++--
 projects/771mod.vcproj  |  4 ++--
 projects/772mod.vcproj  |  4 ++--
 projects/773mod.vcproj  |  4 ++--
 projects/774.vcproj     |  4 ++--
 projects/775.vcproj     |  4 ++--
 projects/776mod.vcproj  |  4 ++--
 projects/777.vcproj     |  4 ++--
 projects/77cnv.vcproj   |  4 ++--
 projects/Ba1.vcproj     |  4 ++--
 projects/Ba2.vcproj     |  4 ++--
 projects/Ba3.vcproj     |  4 ++--
 projects/Ba4.vcproj     |  4 ++--
 projects/Ba5.vcproj     |  4 ++--
 projects/Ba6.vcproj     |  4 ++--
 projects/Ba7.vcproj     |  4 ++--
 projects/Bacnv.vcproj   |  4 ++--
 projects/Bainst.vcproj  |  4 ++--
 projects/Cacnv.vcproj   |  4 ++--
 projects/Cg0.vcproj     |  4 ++--
 projects/Cg1.vcproj     |  4 ++--
 projects/Cg2.vcproj     |  4 ++--
 projects/Cg3.vcproj     |  4 ++--
 projects/Cg4.vcproj     |  4 ++--
 projects/Cg5.vcproj     |  4 ++--
 projects/Cg6.vcproj     |  4 ++--
 projects/Cg7.vcproj     |  4 ++--
 projects/Cgp0.vcproj    |  4 ++--
 projects/Cgp1.vcproj    |  4 ++--
 projects/Cgp2.vcproj    |  4 ++--
 projects/Cgp3.vcproj    |  4 ++--
 projects/Ef0.vcproj     |  4 ++--
 projects/In0.vcproj     |  4 ++--
 projects/Or1.vcproj     |  4 ++--
 projects/Sc0.vcproj     |  4 ++--
 projects/Sc1.vcproj     |  6 +++---
 projects/Sc2.vcproj     |  4 ++--
 projects/Sc3.vcproj     |  6 +++---
 projects/ab0.vcproj     |  4 ++--
 projects/ab1.vcproj     |  4 ++--
 projects/ab2.vcproj     |  4 ++--
 projects/ab3.vcproj     |  4 ++--
 projects/ba0.vcproj     |  4 ++--
 projects/ba8.vcproj     |  4 ++--
 projects/ca0.vcproj     | 28 ++++++++++++++++++++++++++--
 projects/ca1.vcproj     |  4 ++--
 projects/ca2.vcproj     |  4 ++--
 projects/ca3.vcproj     | 28 ++++++++++++++++++++++++++--
 projects/ce0.vcproj     |  4 ++--
 projects/ce1.vcproj     |  4 ++--
 projects/ce2.vcproj     |  4 ++--
 projects/ce3.vcproj     |  4 ++--
 projects/ce4.vcproj     |  4 ++--
 projects/ci0.vcproj     |  4 ++--
 projects/ci1.vcproj     |  4 ++--
 projects/crpa0.vcproj   |  4 ++--
 projects/crpa1.vcproj   |  4 ++--
 projects/db0.vcproj     |  4 ++--
 projects/db1.vcproj     |  4 ++--
 projects/db2.vcproj     |  4 ++--
 projects/dt0.vcproj     |  4 ++--
 projects/gv0.vcproj     |  4 ++--
 projects/li0.vcproj     |  4 ++--
 projects/mg0.vcproj     |  4 ++--
 projects/mg1.vcproj     |  4 ++--
 projects/mg3.vcproj     |  4 ++--
 projects/mg4.vcproj     |  4 ++--
 projects/mr0.vcproj     |  4 ++--
 projects/mr1.vcproj     |  4 ++--
 projects/mr2.vcproj     |  4 ++--
 projects/pr0.vcproj     |  4 ++--
 projects/pr1.vcproj     |  4 ++--
 projects/sv0.vcproj     |  4 ++--
 projects/sv1.vcproj     |  4 ++--
 projects/sv2.vcproj     |  4 ++--
 projects/tc0.vcproj     |  4 ++--
 projects/tc1.vcproj     | 36 ++++++++++++++++++++++++++++++++++--
 projects/tc9.vcproj     |  4 ++--
 projects/tp0.vcproj     |  4 ++--
 projects/vd0.vcproj     |  4 ++--
 projects/vd1.vcproj     |  4 ++--
 projects/ve0.vcproj     |  4 ++--
 projects/ve1.vcproj     |  4 ++--
 projects/ve2.vcproj     |  4 ++--
 projects/ve3.vcproj     |  4 ++--
 projects/ve4.vcproj     |  4 ++--
 projects/ve5.vcproj     |  4 ++--
 projects/ve6.vcproj     |  4 ++--
 projects/ve7.vcproj     |  4 ++--
 projects/ve8.vcproj     | 12 ++++++++++--
 projects/vesirio.vcproj |  4 ++--
 projects/xvaga.vcproj   | 20 ++++++++++----------
 projects/xvapp.vcproj   | 20 ++++++++++----------
 93 files changed, 292 insertions(+), 204 deletions(-)

diff --git a/projects/770.vcproj b/projects/770.vcproj
index 84793ad95..2e10c76e6 100755
--- a/projects/770.vcproj
+++ b/projects/770.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/771mod.vcproj b/projects/771mod.vcproj
index 13c574470..7859e85a5 100755
--- a/projects/771mod.vcproj
+++ b/projects/771mod.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/772mod.vcproj b/projects/772mod.vcproj
index 9868ab8f3..f4469be60 100755
--- a/projects/772mod.vcproj
+++ b/projects/772mod.vcproj
@@ -67,7 +67,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/773mod.vcproj b/projects/773mod.vcproj
index 829e2f497..d1ef5c21d 100755
--- a/projects/773mod.vcproj
+++ b/projects/773mod.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/774.vcproj b/projects/774.vcproj
index 2579100b7..21d5680ee 100755
--- a/projects/774.vcproj
+++ b/projects/774.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/775.vcproj b/projects/775.vcproj
index a48176015..7432126db 100755
--- a/projects/775.vcproj
+++ b/projects/775.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/776mod.vcproj b/projects/776mod.vcproj
index a65d9092d..1782da388 100755
--- a/projects/776mod.vcproj
+++ b/projects/776mod.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/777.vcproj b/projects/777.vcproj
index 33a496ecf..e7b52b114 100755
--- a/projects/777.vcproj
+++ b/projects/777.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/77cnv.vcproj b/projects/77cnv.vcproj
index 6e4314dc2..b74783edf 100755
--- a/projects/77cnv.vcproj
+++ b/projects/77cnv.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Ba1.vcproj b/projects/Ba1.vcproj
index aec16fa0e..b21fd3aaa 100755
--- a/projects/Ba1.vcproj
+++ b/projects/Ba1.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -164,7 +164,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Ba2.vcproj b/projects/Ba2.vcproj
index 150f3259c..dad190c4e 100755
--- a/projects/Ba2.vcproj
+++ b/projects/Ba2.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Ba3.vcproj b/projects/Ba3.vcproj
index 9bc21524c..d89151eca 100755
--- a/projects/Ba3.vcproj
+++ b/projects/Ba3.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Ba4.vcproj b/projects/Ba4.vcproj
index 5697cce67..710c2e3de 100755
--- a/projects/Ba4.vcproj
+++ b/projects/Ba4.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Ba5.vcproj b/projects/Ba5.vcproj
index c4d0f8b03..d54f8fb25 100755
--- a/projects/Ba5.vcproj
+++ b/projects/Ba5.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Ba6.vcproj b/projects/Ba6.vcproj
index e1afb224a..9a35e3ed6 100755
--- a/projects/Ba6.vcproj
+++ b/projects/Ba6.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Ba7.vcproj b/projects/Ba7.vcproj
index e20d7ed5a..1a505fd90 100755
--- a/projects/Ba7.vcproj
+++ b/projects/Ba7.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Bacnv.vcproj b/projects/Bacnv.vcproj
index 803a07a52..d4cd69391 100755
--- a/projects/Bacnv.vcproj
+++ b/projects/Bacnv.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Bainst.vcproj b/projects/Bainst.vcproj
index b812971ea..d35f46b56 100755
--- a/projects/Bainst.vcproj
+++ b/projects/Bainst.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Cacnv.vcproj b/projects/Cacnv.vcproj
index 5c1df1d21..98710d613 100755
--- a/projects/Cacnv.vcproj
+++ b/projects/Cacnv.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Cg0.vcproj b/projects/Cg0.vcproj
index c020433d1..eae10933d 100755
--- a/projects/Cg0.vcproj
+++ b/projects/Cg0.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Cg1.vcproj b/projects/Cg1.vcproj
index b11ddcd5e..22b70e32b 100755
--- a/projects/Cg1.vcproj
+++ b/projects/Cg1.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Cg2.vcproj b/projects/Cg2.vcproj
index a39fd4e21..dd8ff7858 100755
--- a/projects/Cg2.vcproj
+++ b/projects/Cg2.vcproj
@@ -67,7 +67,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Cg3.vcproj b/projects/Cg3.vcproj
index e9e3bbb35..af7200f50 100755
--- a/projects/Cg3.vcproj
+++ b/projects/Cg3.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -164,7 +164,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Cg4.vcproj b/projects/Cg4.vcproj
index bd087dffe..13d4f1043 100755
--- a/projects/Cg4.vcproj
+++ b/projects/Cg4.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Cg5.vcproj b/projects/Cg5.vcproj
index a4be36784..257b9e7e8 100755
--- a/projects/Cg5.vcproj
+++ b/projects/Cg5.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Cg6.vcproj b/projects/Cg6.vcproj
index c69079fda..7227f55fb 100755
--- a/projects/Cg6.vcproj
+++ b/projects/Cg6.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Cg7.vcproj b/projects/Cg7.vcproj
index e7c9852be..c16ffd4b0 100755
--- a/projects/Cg7.vcproj
+++ b/projects/Cg7.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Cgp0.vcproj b/projects/Cgp0.vcproj
index a1138e3ea..013a039e6 100755
--- a/projects/Cgp0.vcproj
+++ b/projects/Cgp0.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Cgp1.vcproj b/projects/Cgp1.vcproj
index b6ff016e3..c2a42838a 100755
--- a/projects/Cgp1.vcproj
+++ b/projects/Cgp1.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Cgp2.vcproj b/projects/Cgp2.vcproj
index c836e4b23..f6f5f7f55 100755
--- a/projects/Cgp2.vcproj
+++ b/projects/Cgp2.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Cgp3.vcproj b/projects/Cgp3.vcproj
index 273cd1e0b..5512fdea8 100755
--- a/projects/Cgp3.vcproj
+++ b/projects/Cgp3.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Ef0.vcproj b/projects/Ef0.vcproj
index 4b82b4d0a..a52d7276b 100755
--- a/projects/Ef0.vcproj
+++ b/projects/Ef0.vcproj
@@ -67,7 +67,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/In0.vcproj b/projects/In0.vcproj
index 4b205c918..691817b15 100755
--- a/projects/In0.vcproj
+++ b/projects/In0.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Or1.vcproj b/projects/Or1.vcproj
index cb19cc52f..5b9ad14ae 100755
--- a/projects/Or1.vcproj
+++ b/projects/Or1.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Sc0.vcproj b/projects/Sc0.vcproj
index c7d6934b5..34547e728 100755
--- a/projects/Sc0.vcproj
+++ b/projects/Sc0.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Sc1.vcproj b/projects/Sc1.vcproj
index 5706de43c..d3c096c16 100755
--- a/projects/Sc1.vcproj
+++ b/projects/Sc1.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="\wx283\include;..\..\wx283\include"
+				AdditionalIncludeDirectories="\wx287\include;..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -470,7 +470,7 @@
 				<Tool
 					Name="VCResourceCompilerTool"
 					PreprocessorDefinitions=""
-					AdditionalIncludeDirectories="..\..\wx283\include;$(NoInherit)"
+					AdditionalIncludeDirectories="..\..\wx287\include;$(NoInherit)"
 				/>
 			</FileConfiguration>
 		</File>
diff --git a/projects/Sc2.vcproj b/projects/Sc2.vcproj
index 8277658eb..beaca60af 100755
--- a/projects/Sc2.vcproj
+++ b/projects/Sc2.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Sc3.vcproj b/projects/Sc3.vcproj
index af99eff1d..f5a3b4d78 100755
--- a/projects/Sc3.vcproj
+++ b/projects/Sc3.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="\wx283\include;..\..\wx283\include"
+				AdditionalIncludeDirectories="\wx287\include;..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -425,7 +425,7 @@
 				<Tool
 					Name="VCResourceCompilerTool"
 					PreprocessorDefinitions=""
-					AdditionalIncludeDirectories="..\..\wx283\include;$(NoInherit)"
+					AdditionalIncludeDirectories="..\..\wx287\include;$(NoInherit)"
 				/>
 			</FileConfiguration>
 		</File>
diff --git a/projects/ab0.vcproj b/projects/ab0.vcproj
index d7bffd323..d83c6976e 100755
--- a/projects/ab0.vcproj
+++ b/projects/ab0.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ab1.vcproj b/projects/ab1.vcproj
index 3e5362adc..d987456d1 100755
--- a/projects/ab1.vcproj
+++ b/projects/ab1.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ab2.vcproj b/projects/ab2.vcproj
index 9090eb4ef..9c85065cc 100755
--- a/projects/ab2.vcproj
+++ b/projects/ab2.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ab3.vcproj b/projects/ab3.vcproj
index 8e43ad893..eb2b360bb 100755
--- a/projects/ab3.vcproj
+++ b/projects/ab3.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ba0.vcproj b/projects/ba0.vcproj
index 2d96b61c0..199802aff 100755
--- a/projects/ba0.vcproj
+++ b/projects/ba0.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ba8.vcproj b/projects/ba8.vcproj
index 25363043e..f7e51adb6 100755
--- a/projects/ba8.vcproj
+++ b/projects/ba8.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ca0.vcproj b/projects/ca0.vcproj
index b8c973141..32486f055 100755
--- a/projects/ca0.vcproj
+++ b/projects/ca0.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -569,6 +569,30 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\ca\catbauc.uml"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Compiling mask $(InputPath)..."
+						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk"
+						Outputs="$(TargetDir)$(InputName).msk"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Compiling mask $(InputPath)..."
+						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk"
+						Outputs="$(TargetDir)$(InputName).msk"
+					/>
+				</FileConfiguration>
+			</File>
 			<File
 				RelativePath="..\ca\catbrsp.uml"
 				>
diff --git a/projects/ca1.vcproj b/projects/ca1.vcproj
index dade0887c..adc1e3839 100755
--- a/projects/ca1.vcproj
+++ b/projects/ca1.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ca2.vcproj b/projects/ca2.vcproj
index d085f3400..36c5ab899 100755
--- a/projects/ca2.vcproj
+++ b/projects/ca2.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ca3.vcproj b/projects/ca3.vcproj
index f5bb32c5b..5785fd314 100755
--- a/projects/ca3.vcproj
+++ b/projects/ca3.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -1103,6 +1103,30 @@
 			<File
 				RelativePath="..\ca\ca3800b.rep"
 				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Copying rep $(InputPath)..."
+						CommandLine="copy $(InputPath) $(TargetDir)$(InputName).rep&#x0D;&#x0A;"
+						Outputs="$(TargetDir)$(InputName).rep"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Copying rep $(InputPath)..."
+						CommandLine="copy $(InputPath) $(TargetDir)$(InputName).rep&#x0D;&#x0A;"
+						Outputs="$(TargetDir)$(InputName).rep"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\ca\ca3800c.rep"
+				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
diff --git a/projects/ce0.vcproj b/projects/ce0.vcproj
index aa4ee410c..6d8f49831 100755
--- a/projects/ce0.vcproj
+++ b/projects/ce0.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ce1.vcproj b/projects/ce1.vcproj
index 210484621..9628df00f 100755
--- a/projects/ce1.vcproj
+++ b/projects/ce1.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ce2.vcproj b/projects/ce2.vcproj
index 610b8638b..66e31754e 100755
--- a/projects/ce2.vcproj
+++ b/projects/ce2.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ce3.vcproj b/projects/ce3.vcproj
index f0a2d9b50..d6fd5742a 100755
--- a/projects/ce3.vcproj
+++ b/projects/ce3.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ce4.vcproj b/projects/ce4.vcproj
index f65cd91ca..f7abcda4b 100755
--- a/projects/ce4.vcproj
+++ b/projects/ce4.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -164,7 +164,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ci0.vcproj b/projects/ci0.vcproj
index 81b8454fd..ae023ba5c 100755
--- a/projects/ci0.vcproj
+++ b/projects/ci0.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ci1.vcproj b/projects/ci1.vcproj
index 1fc99ab54..1310083c7 100755
--- a/projects/ci1.vcproj
+++ b/projects/ci1.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/crpa0.vcproj b/projects/crpa0.vcproj
index 161a18423..b8aa945d5 100755
--- a/projects/crpa0.vcproj
+++ b/projects/crpa0.vcproj
@@ -67,7 +67,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/crpa1.vcproj b/projects/crpa1.vcproj
index f351accca..f2769b68a 100755
--- a/projects/crpa1.vcproj
+++ b/projects/crpa1.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -164,7 +164,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/db0.vcproj b/projects/db0.vcproj
index 044eccbaa..a8a52ddad 100755
--- a/projects/db0.vcproj
+++ b/projects/db0.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/db1.vcproj b/projects/db1.vcproj
index 55551fec3..ef59e90cd 100755
--- a/projects/db1.vcproj
+++ b/projects/db1.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/db2.vcproj b/projects/db2.vcproj
index 307d2c2c3..0a2aae2b6 100755
--- a/projects/db2.vcproj
+++ b/projects/db2.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/dt0.vcproj b/projects/dt0.vcproj
index a01758285..515246fec 100755
--- a/projects/dt0.vcproj
+++ b/projects/dt0.vcproj
@@ -67,7 +67,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/gv0.vcproj b/projects/gv0.vcproj
index 6ebe76a13..e6f2212c8 100755
--- a/projects/gv0.vcproj
+++ b/projects/gv0.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/li0.vcproj b/projects/li0.vcproj
index 7f2d27626..6b22fabed 100755
--- a/projects/li0.vcproj
+++ b/projects/li0.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -164,7 +164,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/mg0.vcproj b/projects/mg0.vcproj
index 1543ee8d4..8b358ff27 100755
--- a/projects/mg0.vcproj
+++ b/projects/mg0.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/mg1.vcproj b/projects/mg1.vcproj
index 38f2ebe71..338acad31 100755
--- a/projects/mg1.vcproj
+++ b/projects/mg1.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/mg3.vcproj b/projects/mg3.vcproj
index 2e6f8c479..4c408760f 100755
--- a/projects/mg3.vcproj
+++ b/projects/mg3.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/mg4.vcproj b/projects/mg4.vcproj
index fcba9cb8a..ddccb0081 100755
--- a/projects/mg4.vcproj
+++ b/projects/mg4.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/mr0.vcproj b/projects/mr0.vcproj
index 1d3cb6211..8fcf1fd61 100755
--- a/projects/mr0.vcproj
+++ b/projects/mr0.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/mr1.vcproj b/projects/mr1.vcproj
index 859266524..dda7ed68f 100755
--- a/projects/mr1.vcproj
+++ b/projects/mr1.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/mr2.vcproj b/projects/mr2.vcproj
index c8b407a74..d44e20179 100755
--- a/projects/mr2.vcproj
+++ b/projects/mr2.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/pr0.vcproj b/projects/pr0.vcproj
index 11630d8ad..4255bb9bf 100755
--- a/projects/pr0.vcproj
+++ b/projects/pr0.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/pr1.vcproj b/projects/pr1.vcproj
index f545bc0e0..f136e2d4a 100755
--- a/projects/pr1.vcproj
+++ b/projects/pr1.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/sv0.vcproj b/projects/sv0.vcproj
index 1f9742072..69c60029c 100755
--- a/projects/sv0.vcproj
+++ b/projects/sv0.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/sv1.vcproj b/projects/sv1.vcproj
index 866fe0b16..95354f759 100755
--- a/projects/sv1.vcproj
+++ b/projects/sv1.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -164,7 +164,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/sv2.vcproj b/projects/sv2.vcproj
index 94cb0d893..d1924b926 100755
--- a/projects/sv2.vcproj
+++ b/projects/sv2.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/tc0.vcproj b/projects/tc0.vcproj
index 9a83c0085..62aee368b 100755
--- a/projects/tc0.vcproj
+++ b/projects/tc0.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/tc1.vcproj b/projects/tc1.vcproj
index acec961d8..8f79d2cc8 100755
--- a/projects/tc1.vcproj
+++ b/projects/tc1.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -258,6 +258,10 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\tc\tc1800.cpp"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Masks"
@@ -287,6 +291,30 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\tc\tc1800a.uml"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Compiling mask $(InputPath)..."
+						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk"
+						Outputs="$(TargetDir)$(InputName).msk"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Compiling mask $(InputPath)..."
+						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk"
+						Outputs="$(TargetDir)$(InputName).msk"
+					/>
+				</FileConfiguration>
+			</File>
 		</Filter>
 		<Filter
 			Name="Headers"
@@ -300,6 +328,10 @@
 				RelativePath="..\tc\tc1100a.h"
 				>
 			</File>
+			<File
+				RelativePath="..\tc\tc1800a.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Ini"
diff --git a/projects/tc9.vcproj b/projects/tc9.vcproj
index d55044123..75346df31 100755
--- a/projects/tc9.vcproj
+++ b/projects/tc9.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/tp0.vcproj b/projects/tp0.vcproj
index 6f953fd94..44e1e7346 100755
--- a/projects/tp0.vcproj
+++ b/projects/tp0.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/vd0.vcproj b/projects/vd0.vcproj
index 63027d087..f066c96d0 100755
--- a/projects/vd0.vcproj
+++ b/projects/vd0.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/vd1.vcproj b/projects/vd1.vcproj
index d519dc78b..dd4ef952a 100755
--- a/projects/vd1.vcproj
+++ b/projects/vd1.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ve0.vcproj b/projects/ve0.vcproj
index 95b906448..fd49d9088 100755
--- a/projects/ve0.vcproj
+++ b/projects/ve0.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -164,7 +164,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ve1.vcproj b/projects/ve1.vcproj
index 247d5afb9..edcd6d3dc 100755
--- a/projects/ve1.vcproj
+++ b/projects/ve1.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ve2.vcproj b/projects/ve2.vcproj
index 779e260b9..ac5e430ed 100755
--- a/projects/ve2.vcproj
+++ b/projects/ve2.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ve3.vcproj b/projects/ve3.vcproj
index 338b3a905..2e3210658 100755
--- a/projects/ve3.vcproj
+++ b/projects/ve3.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ve4.vcproj b/projects/ve4.vcproj
index c9ada1b1b..a96f4c05c 100755
--- a/projects/ve4.vcproj
+++ b/projects/ve4.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ve5.vcproj b/projects/ve5.vcproj
index cabc95bce..e6b1430ec 100755
--- a/projects/ve5.vcproj
+++ b/projects/ve5.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ve6.vcproj b/projects/ve6.vcproj
index 2e9860324..8039c2878 100755
--- a/projects/ve6.vcproj
+++ b/projects/ve6.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ve7.vcproj b/projects/ve7.vcproj
index a0cdb2015..4944d920a 100755
--- a/projects/ve7.vcproj
+++ b/projects/ve7.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ve8.vcproj b/projects/ve8.vcproj
index 9647e793e..22a766639 100755
--- a/projects/ve8.vcproj
+++ b/projects/ve8.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -236,6 +236,14 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\cg\cg2101.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\cg\cglib02.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\gv\gvlib.cpp"
 				>
diff --git a/projects/vesirio.vcproj b/projects/vesirio.vcproj
index 16f6367cc..a73f2f48b 100755
--- a/projects/vesirio.vcproj
+++ b/projects/vesirio.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/xvaga.vcproj b/projects/xvaga.vcproj
index 5a6232f4e..700b66e4d 100755
--- a/projects/xvaga.vcproj
+++ b/projects/xvaga.vcproj
@@ -48,7 +48,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="4"
-				AdditionalIncludeDirectories="..\..\wx283\lib\vc_dll\msw;..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\lib\vc_dll\msw;..\..\wx287\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;XVAGADLL"
 				RuntimeLibrary="0"
 				PrecompiledHeaderFile=".\..\Release\Xvaga/xvaga.pch"
@@ -139,7 +139,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\wx283\lib\vc_dll\mswd;..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\lib\vc_dll\mswd;..\..\wx287\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;XVAGADLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -534,7 +534,7 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\wx283\lib\vc_dll\wxbase28.lib"
+			RelativePath="..\..\wx287\lib\vc_dll\wxbase28.lib"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -546,7 +546,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx283\lib\vc_dll\wxbase28_odbc.lib"
+			RelativePath="..\..\wx287\lib\vc_dll\wxbase28_odbc.lib"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -558,7 +558,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx283\lib\vc_dll\wxbase28d.lib"
+			RelativePath="..\..\wx287\lib\vc_dll\wxbase28d.lib"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -570,7 +570,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx283\lib\vc_dll\wxbase28d_odbc.lib"
+			RelativePath="..\..\wx287\lib\vc_dll\wxbase28d_odbc.lib"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -582,7 +582,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx283\lib\vc_dll\wxmsw28_adv.lib"
+			RelativePath="..\..\wx287\lib\vc_dll\wxmsw28_adv.lib"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -594,7 +594,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx283\lib\vc_dll\wxmsw28_core.lib"
+			RelativePath="..\..\wx287\lib\vc_dll\wxmsw28_core.lib"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -606,7 +606,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx283\lib\vc_dll\wxmsw28d_adv.lib"
+			RelativePath="..\..\wx287\lib\vc_dll\wxmsw28d_adv.lib"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -618,7 +618,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx283\lib\vc_dll\wxmsw28d_core.lib"
+			RelativePath="..\..\wx287\lib\vc_dll\wxmsw28d_core.lib"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
diff --git a/projects/xvapp.vcproj b/projects/xvapp.vcproj
index b424f0423..eb9b91d28 100755
--- a/projects/xvapp.vcproj
+++ b/projects/xvapp.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\wx283\lib\vc_dll\mswd,..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\lib\vc_dll\mswd,..\..\wx287\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -118,7 +118,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\wx283\lib\vc_dll\msw,..\..\wx283\include"
+				AdditionalIncludeDirectories="..\..\wx287\lib\vc_dll\msw,..\..\wx287\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -201,7 +201,7 @@
 			>
 		</Filter>
 		<File
-			RelativePath="..\..\wx283\lib\vc_dll\wxbase28.lib"
+			RelativePath="..\..\wx287\lib\vc_dll\wxbase28.lib"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -213,7 +213,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx283\lib\vc_dll\wxbase28_odbc.lib"
+			RelativePath="..\..\wx287\lib\vc_dll\wxbase28_odbc.lib"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -225,7 +225,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx283\lib\vc_dll\wxbase28d.lib"
+			RelativePath="..\..\wx287\lib\vc_dll\wxbase28d.lib"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -237,7 +237,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx283\lib\vc_dll\wxbase28d_odbc.lib"
+			RelativePath="..\..\wx287\lib\vc_dll\wxbase28d_odbc.lib"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -249,7 +249,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx283\lib\vc_dll\wxmsw28_adv.lib"
+			RelativePath="..\..\wx287\lib\vc_dll\wxmsw28_adv.lib"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -261,7 +261,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx283\lib\vc_dll\wxmsw28_core.lib"
+			RelativePath="..\..\wx287\lib\vc_dll\wxmsw28_core.lib"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -273,7 +273,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx283\lib\vc_dll\wxmsw28d_adv.lib"
+			RelativePath="..\..\wx287\lib\vc_dll\wxmsw28d_adv.lib"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -285,7 +285,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx283\lib\vc_dll\wxmsw28d_core.lib"
+			RelativePath="..\..\wx287\lib\vc_dll\wxmsw28d_core.lib"
 			>
 			<FileConfiguration
 				Name="Release|Win32"