From 82f6deda586d27b9e2ed253a9d44477f4257b9ec Mon Sep 17 00:00:00 2001
From: luca <luca@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Fri, 6 Mar 2009 11:48:48 +0000
Subject: [PATCH] Patch level         : Files correlati     : Ricompilazione
 Demo : [ ] Commento            : passata la 10.0 a wx289

git-svn-id: svn://10.65.10.50/trunk@18431 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 projects/770.rc            |   2 +-
 projects/770.vcproj        |  64 +++----
 projects/771mod.rc         |   2 +-
 projects/771mod.vcproj     |   4 +-
 projects/772mod.rc         |   2 +-
 projects/772mod.vcproj     |   4 +-
 projects/773mod.rc         |   2 +-
 projects/773mod.vcproj     |   4 +-
 projects/774.rc            |   2 +-
 projects/774.vcproj        |   4 +-
 projects/775.rc            |   2 +-
 projects/775.vcproj        |   4 +-
 projects/776mod.rc         |   2 +-
 projects/776mod.vcproj     |   4 +-
 projects/777.rc            |   2 +-
 projects/777.vcproj        |   4 +-
 projects/77cnv.rc          |   2 +-
 projects/77cnv.vcproj      |   4 +-
 projects/Authoriz.vcproj   |  22 +--
 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/BaseServ.vcproj   |  20 +--
 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/Cgp1.vcproj       |   4 +-
 projects/Cgp2.vcproj       |   4 +-
 projects/Cgp3.vcproj       |   4 +-
 projects/Database.vcproj   |  42 ++---
 projects/Diction.vcproj    |  22 +--
 projects/Ef0.vcproj        |   4 +-
 projects/In0.vcproj        |   8 +-
 projects/Lurch.vcproj      |  26 +--
 projects/Or1.vcproj        |   4 +-
 projects/Postman.vcproj    |  22 +--
 projects/Sc0.vcproj        |   4 +-
 projects/Sc1.vcproj        |   6 +-
 projects/Sc2.vcproj        |   4 +-
 projects/Sc3.vcproj        |   6 +-
 projects/ServerLib.vcproj  |  46 ++---
 projects/Setup.vcproj      |  52 +++---
 projects/ab0.rc            |   2 +-
 projects/ab0.vcproj        |   4 +-
 projects/ab1.rc            |   2 +-
 projects/ab1.vcproj        |   4 +-
 projects/ab2.rc            |   2 +-
 projects/ab2.vcproj        |   4 +-
 projects/ab3.rc            |   2 +-
 projects/ab3.vcproj        |   4 +-
 projects/ba0.rc            |   2 +-
 projects/ba0.vcproj        |   4 +-
 projects/ba1.rc            |   2 +-
 projects/ba2.rc            |   2 +-
 projects/ba3.rc            |   2 +-
 projects/ba4.rc            |   2 +-
 projects/ba5.rc            |   2 +-
 projects/ba6.rc            |   2 +-
 projects/ba7.rc            |   2 +-
 projects/ba8.rc            |   2 +-
 projects/ba8.vcproj        |   4 +-
 projects/bacnv.rc          |   2 +-
 projects/bainst.rc         |   2 +-
 projects/ca0.rc            |   2 +-
 projects/ca0.vcproj        |   4 +-
 projects/ca1.rc            |   2 +-
 projects/ca1.vcproj        |   4 +-
 projects/ca2.rc            |   2 +-
 projects/ca2.vcproj        |   4 +-
 projects/ca3.rc            |   2 +-
 projects/ca3.vcproj        |   4 +-
 projects/ca9.vcproj        |   4 +-
 projects/cacnv.rc          |   2 +-
 projects/ce0.rc            |   2 +-
 projects/ce0.vcproj        |   4 +-
 projects/ce1.rc            |   2 +-
 projects/ce1.vcproj        |   4 +-
 projects/ce2.rc            |   2 +-
 projects/ce2.vcproj        |   4 +-
 projects/ce3.rc            |   2 +-
 projects/ce3.vcproj        |   4 +-
 projects/ce4.rc            |   2 +-
 projects/ce4.vcproj        |   4 +-
 projects/cg0.rc            |   2 +-
 projects/cg1.rc            |   2 +-
 projects/cg2.rc            |   2 +-
 projects/cg3.rc            |   2 +-
 projects/cg4.rc            |   2 +-
 projects/cg5.rc            |   2 +-
 projects/cg6.rc            |   2 +-
 projects/cg7.rc            |   2 +-
 projects/cgp1.rc           |   2 +-
 projects/cgp2.rc           |   2 +-
 projects/cgp3.rc           |   2 +-
 projects/cgp4.rc           |   2 +-
 projects/ci0.rc            |   2 +-
 projects/ci0.vcproj        |   4 +-
 projects/ci1.rc            |   2 +-
 projects/ci1.vcproj        |   4 +-
 projects/cm0.rc            |   2 +-
 projects/cm1.rc            |   2 +-
 projects/co0.rc            |   2 +-
 projects/co0.vcproj        |   4 +-
 projects/co1.rc            |   2 +-
 projects/co1.vcproj        |   4 +-
 projects/coffee.vcproj     |  26 +--
 projects/crpa0.rc          |   2 +-
 projects/crpa0.vcproj      |   4 +-
 projects/crpa1.rc          |   2 +-
 projects/crpa1.vcproj      |   4 +-
 projects/db0.rc            |   2 +-
 projects/db0.vcproj        |   4 +-
 projects/db1.rc            |   2 +-
 projects/db1.vcproj        |   4 +-
 projects/db2.rc            |   2 +-
 projects/db2.vcproj        |   4 +-
 projects/dl0.rc            |   2 +-
 projects/dlinst.rc         |   2 +-
 projects/dt0.rc            |   2 +-
 projects/dt0.vcproj        |   4 +-
 projects/ef0.rc            |   2 +-
 projects/gv0.rc            |   2 +-
 projects/gv0.vcproj        |   4 +-
 projects/in0.rc            |   2 +-
 projects/li0.rc            |   2 +-
 projects/li0.vcproj        |   4 +-
 projects/lv0.rc            |   2 +-
 projects/lv0.vcproj        |   4 +-
 projects/lv2.rc            |   2 +-
 projects/lv2.vcproj        |   4 +-
 projects/lv3.rc            |   2 +-
 projects/lv3.vcproj        |   4 +-
 projects/mg0.rc            |   2 +-
 projects/mg0.vcproj        |   4 +-
 projects/mg1.rc            |   2 +-
 projects/mg1.vcproj        |   4 +-
 projects/mg3.rc            |   2 +-
 projects/mg3.vcproj        |   4 +-
 projects/mg4.rc            |   2 +-
 projects/mg4.vcproj        |   4 +-
 projects/mr0.rc            |   2 +-
 projects/mr0.vcproj        |   4 +-
 projects/mr1.rc            |   2 +-
 projects/mr1.vcproj        |   4 +-
 projects/mr2.rc            |   2 +-
 projects/mr2.vcproj        |   4 +-
 projects/omnia0.rc         |   2 +-
 projects/or1.rc            |   2 +-
 projects/pd0001.rc         |   2 +-
 projects/pd0001.vcproj     |   4 +-
 projects/pd0350.rc         |   2 +-
 projects/pd0350.vcproj     |   4 +-
 projects/pd0666.rc         |   2 +-
 projects/pd0666.vcproj     |   4 +-
 projects/pd0777.rc         |   2 +-
 projects/pd0777.vcproj     |   4 +-
 projects/pd1579.rc         |   2 +-
 projects/pd1579.vcproj     |   4 +-
 projects/pd1890.rc         |   2 +-
 projects/pd1890.vcproj     |   4 +-
 projects/pd6030.rc         |   2 +-
 projects/pd6030.vcproj     |   4 +-
 projects/pd6142.rc         |   2 +-
 projects/pd6142.vcproj     |   4 +-
 projects/pdflibwrap.vcproj |   5 +-
 projects/pg0001.rc         |   2 +-
 projects/pg0001.vcproj     |   4 +-
 projects/pg0069.rc         |   2 +-
 projects/pg0069.vcproj     |   4 +-
 projects/pg0388.rc         |   2 +-
 projects/pg0388.vcproj     |   4 +-
 projects/pr0.rc            |   2 +-
 projects/pr0.vcproj        | 348 ++++++++++---------------------------
 projects/pr1.rc            |   2 +-
 projects/pr1.vcproj        |   4 +-
 projects/ps0017.rc         |   2 +-
 projects/ps0017.vcproj     |   4 +-
 projects/ps0077.rc         |   2 +-
 projects/ps0077.vcproj     |   4 +-
 projects/ps0099.rc         |   2 +-
 projects/ps0099.vcproj     |   4 +-
 projects/ps0430.rc         |   2 +-
 projects/ps0430.vcproj     |   4 +-
 projects/ps0544.rc         |   2 +-
 projects/ps0544.vcproj     |   4 +-
 projects/ps0713.rc         |   2 +-
 projects/ps0713.vcproj     |   4 +-
 projects/ps0816.rc         |   2 +-
 projects/ps0816.vcproj     |   4 +-
 projects/ps0872.rc         |   2 +-
 projects/ps0872.vcproj     |   4 +-
 projects/ps0913 .vcproj    |   4 +-
 projects/ps0913.rc         |   2 +-
 projects/ps0920.rc         |   2 +-
 projects/ps0920.vcproj     |   4 +-
 projects/ps1100.rc         |   2 +-
 projects/ps1100.vcproj     |   4 +-
 projects/ps1104.rc         |   2 +-
 projects/ps1104.vcproj     |   4 +-
 projects/pt0001.rc         |   2 +-
 projects/pt0001.vcproj     |   4 +-
 projects/pt0195.rc         |   2 +-
 projects/pt0195.vcproj     |   4 +-
 projects/sc0.rc            |   2 +-
 projects/sc1.rc            |   2 +-
 projects/sc2.rc            |   2 +-
 projects/sc3.rc            |   2 +-
 projects/si0.rc            |   2 +-
 projects/sv0.rc            |   2 +-
 projects/sv0.vcproj        |   4 +-
 projects/sv1.rc            |   2 +-
 projects/sv1.vcproj        |   4 +-
 projects/sv2.rc            |   2 +-
 projects/sv2.vcproj        |   4 +-
 projects/tc0.rc            |   2 +-
 projects/tc0.vcproj        |   4 +-
 projects/tc1.rc            |   2 +-
 projects/tc1.vcproj        |   4 +-
 projects/tc8.rc            |   2 +-
 projects/tc8.vcproj        |   4 +-
 projects/tc9.rc            |   2 +-
 projects/tc9.vcproj        |   4 +-
 projects/tp0.rc            |   2 +-
 projects/tp0.vcproj        |   4 +-
 projects/update.vcproj     |  52 +++---
 projects/vd0.rc            |   2 +-
 projects/vd0.vcproj        |   4 +-
 projects/vd1.rc            |   2 +-
 projects/vd1.vcproj        |   4 +-
 projects/ve0.rc            |   2 +-
 projects/ve0.vcproj        |   6 +-
 projects/ve1.rc            |   2 +-
 projects/ve1.vcproj        |   4 +-
 projects/ve2.rc            |   2 +-
 projects/ve2.vcproj        |   4 +-
 projects/ve3.rc            |   2 +-
 projects/ve3.vcproj        |   4 +-
 projects/ve4.rc            |   2 +-
 projects/ve4.vcproj        |   4 +-
 projects/ve5.rc            |   2 +-
 projects/ve5.vcproj        |   4 +-
 projects/ve6.rc            |   2 +-
 projects/ve6.vcproj        |   4 +-
 projects/ve8.rc            |   2 +-
 projects/ve8.vcproj        |   4 +-
 projects/xvaga.vcproj      |  24 +--
 projects/xvapp.vcproj      |  20 +--
 259 files changed, 683 insertions(+), 842 deletions(-)

diff --git a/projects/770.rc b/projects/770.rc
index 7593751ff..a92f59451 100755
--- a/projects/770.rc
+++ b/projects/770.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/770.vcproj b/projects/770.vcproj
index e7213d2be..ce4a17df8 100755
--- a/projects/770.vcproj
+++ b/projects/770.vcproj
@@ -31,25 +31,28 @@
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="GifCompiler"
+				Name="DatCompiler"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
+			<Tool
+				Name="BmpCompiler"
+			/>
+			<Tool
+				Name="GifCompiler"
+			/>
 			<Tool
 				Name="DesCompiler"
 			/>
-			<Tool
-				Name="FormCompiler"
-			/>
-			<Tool
-				Name="DatCompiler"
-			/>
 			<Tool
 				Name="SrcDebugCompiler"
 			/>
 			<Tool
-				Name="SrcReleaseCompiler"
+				Name="MskCompiler"
+			/>
+			<Tool
+				Name="FormCompiler"
 			/>
 			<Tool
 				Name="AlxCompiler"
@@ -57,6 +60,9 @@
 			<Tool
 				Name="TxtCompiler"
 			/>
+			<Tool
+				Name="PngCompiler"
+			/>
 			<Tool
 				Name="JpegCompiler"
 			/>
@@ -73,14 +79,11 @@
 				Name="TrrCompiler"
 			/>
 			<Tool
-				Name="BmpCompiler"
+				Name="SrcReleaseCompiler"
 			/>
 			<Tool
 				Name="DirCompiler"
 			/>
-			<Tool
-				Name="MskCompiler"
-			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
 			/>
@@ -119,7 +122,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -175,25 +178,28 @@
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="GifCompiler"
+				Name="DatCompiler"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
+			<Tool
+				Name="BmpCompiler"
+			/>
+			<Tool
+				Name="GifCompiler"
+			/>
 			<Tool
 				Name="DesCompiler"
 			/>
-			<Tool
-				Name="FormCompiler"
-			/>
-			<Tool
-				Name="DatCompiler"
-			/>
 			<Tool
 				Name="SrcDebugCompiler"
 			/>
 			<Tool
-				Name="SrcReleaseCompiler"
+				Name="MskCompiler"
+			/>
+			<Tool
+				Name="FormCompiler"
 			/>
 			<Tool
 				Name="AlxCompiler"
@@ -201,6 +207,9 @@
 			<Tool
 				Name="TxtCompiler"
 			/>
+			<Tool
+				Name="PngCompiler"
+			/>
 			<Tool
 				Name="JpegCompiler"
 			/>
@@ -217,14 +226,11 @@
 				Name="TrrCompiler"
 			/>
 			<Tool
-				Name="BmpCompiler"
+				Name="SrcReleaseCompiler"
 			/>
 			<Tool
 				Name="DirCompiler"
 			/>
-			<Tool
-				Name="MskCompiler"
-			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
 			/>
@@ -263,7 +269,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -503,15 +509,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\m770\batbca7.uml"
+				RelativePath="..\m770\77tbca7.uml"
 				>
 			</File>
 			<File
-				RelativePath="..\m770\batbcaf.uml"
+				RelativePath="..\m770\77tbcaf.uml"
 				>
 			</File>
 			<File
-				RelativePath="..\m770\batbent.uml"
+				RelativePath="..\m770\77tbent.uml"
 				>
 			</File>
 			<File
diff --git a/projects/771mod.rc b/projects/771mod.rc
index 7593751ff..a92f59451 100755
--- a/projects/771mod.rc
+++ b/projects/771mod.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/771mod.vcproj b/projects/771mod.vcproj
index 11e84ae6b..0d19a5a8b 100755
--- a/projects/771mod.vcproj
+++ b/projects/771mod.vcproj
@@ -107,7 +107,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -238,7 +238,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/772mod.rc b/projects/772mod.rc
index 7593751ff..a92f59451 100755
--- a/projects/772mod.rc
+++ b/projects/772mod.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/772mod.vcproj b/projects/772mod.vcproj
index 60a682176..f29a18a61 100755
--- a/projects/772mod.vcproj
+++ b/projects/772mod.vcproj
@@ -123,7 +123,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -269,7 +269,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/773mod.rc b/projects/773mod.rc
index 7593751ff..a92f59451 100755
--- a/projects/773mod.rc
+++ b/projects/773mod.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/773mod.vcproj b/projects/773mod.vcproj
index 0b18e0f0b..9f685beee 100755
--- a/projects/773mod.vcproj
+++ b/projects/773mod.vcproj
@@ -107,7 +107,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -239,7 +239,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/774.rc b/projects/774.rc
index 7593751ff..a92f59451 100755
--- a/projects/774.rc
+++ b/projects/774.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/774.vcproj b/projects/774.vcproj
index 8f81bf09e..dd7207219 100755
--- a/projects/774.vcproj
+++ b/projects/774.vcproj
@@ -107,7 +107,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -239,7 +239,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/775.rc b/projects/775.rc
index 7593751ff..a92f59451 100755
--- a/projects/775.rc
+++ b/projects/775.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/775.vcproj b/projects/775.vcproj
index a920d2ad6..431bec154 100755
--- a/projects/775.vcproj
+++ b/projects/775.vcproj
@@ -107,7 +107,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -238,7 +238,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/776mod.rc b/projects/776mod.rc
index 7593751ff..a92f59451 100755
--- a/projects/776mod.rc
+++ b/projects/776mod.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/776mod.vcproj b/projects/776mod.vcproj
index 6c3a5a2f7..532811fa6 100755
--- a/projects/776mod.vcproj
+++ b/projects/776mod.vcproj
@@ -107,7 +107,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -239,7 +239,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/777.rc b/projects/777.rc
index 7593751ff..a92f59451 100755
--- a/projects/777.rc
+++ b/projects/777.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/777.vcproj b/projects/777.vcproj
index 7435e2dea..b9df97466 100755
--- a/projects/777.vcproj
+++ b/projects/777.vcproj
@@ -107,7 +107,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -239,7 +239,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/77cnv.rc b/projects/77cnv.rc
index 7593751ff..a92f59451 100755
--- a/projects/77cnv.rc
+++ b/projects/77cnv.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/77cnv.vcproj b/projects/77cnv.vcproj
index ad99b6c2d..37b20b5cd 100755
--- a/projects/77cnv.vcproj
+++ b/projects/77cnv.vcproj
@@ -107,7 +107,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -239,7 +239,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Authoriz.vcproj b/projects/Authoriz.vcproj
index 8ab785f40..f4c4b5f01 100755
--- a/projects/Authoriz.vcproj
+++ b/projects/Authoriz.vcproj
@@ -50,7 +50,7 @@
 				Optimization="1"
 				InlineFunctionExpansion="2"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="..\..\wx287\lib\vc_lib\mswd,..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\lib\vc_lib\mswd,..\..\wx289\include"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;__WINDOWS__;__WXMSW__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="2057"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -142,7 +142,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\wx287\lib\vc_dll\mswd,..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\lib\vc_dll\mswd,..\..\wx289\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;__WINDOWS__;__WXMSW__;DEBUG=1;__WXDEBUG__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT;WXUSINGDLL=1"
 				MinimalRebuild="true"
 				RuntimeLibrary="3"
@@ -159,7 +159,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="2057"
-				AdditionalIncludeDirectories="..\server;..\..\wx287\include"
+				AdditionalIncludeDirectories="..\server;..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -170,7 +170,7 @@
 				OutputFile="../exed/servers/Authoriz.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\wx287\lib"
+				AdditionalLibraryDirectories="..\..\wx289\lib"
 				IgnoreDefaultLibraryNames="libcd.lib,libcid.lib"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\..\Debug\DebugServers/Authoriz.pdb"
@@ -236,7 +236,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\wx287\lib\vc_lib\mswd,..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\lib\vc_lib\mswd,..\..\wx289\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;__WINDOWS__;__WXMSW__;DEBUG=1;__WXDEBUG__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT"
 				MinimalRebuild="true"
 				RuntimeLibrary="1"
@@ -253,14 +253,14 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="2057"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/libpath:&quot;/wx287/lib&quot;"
+				AdditionalOptions="/libpath:&quot;/wx289/lib&quot;"
 				OutputFile="../exed/servers/Authoriz.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -329,7 +329,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="4"
-				AdditionalIncludeDirectories="..\..\wx287\lib\vc_dll\msw,..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\lib\vc_dll\msw,..\..\wx289\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;__WINDOWS__;__WXMSW__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT;WXUSINGDLL=1"
 				RuntimeLibrary="2"
 				PrecompiledHeaderFile=".\..\Release\ReleaseDLLServers/Authoriz.pch"
@@ -343,7 +343,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="2057"
-				AdditionalIncludeDirectories="..\server;..\..\wx287\include"
+				AdditionalIncludeDirectories="..\server;..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -354,7 +354,7 @@
 				OutputFile="D:\Release\campo100/servers/Authoriz.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\wx287\lib"
+				AdditionalLibraryDirectories="..\..\wx289\lib"
 				IgnoreDefaultLibraryNames="libc.lib,libci.lib"
 				ProgramDatabaseFile=".\..\Release\ReleaseDLLServers/Authoriz.pdb"
 				SubSystem="2"
diff --git a/projects/Ba1.vcproj b/projects/Ba1.vcproj
index d6f2225c5..360859b8c 100755
--- a/projects/Ba1.vcproj
+++ b/projects/Ba1.vcproj
@@ -119,7 +119,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -265,7 +265,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Ba2.vcproj b/projects/Ba2.vcproj
index e9de33fcf..2d0c63122 100755
--- a/projects/Ba2.vcproj
+++ b/projects/Ba2.vcproj
@@ -107,7 +107,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -238,7 +238,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Ba3.vcproj b/projects/Ba3.vcproj
index 48800f888..25412a521 100755
--- a/projects/Ba3.vcproj
+++ b/projects/Ba3.vcproj
@@ -107,7 +107,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -239,7 +239,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Ba4.vcproj b/projects/Ba4.vcproj
index 12b2bbffd..9ea3fdd9e 100755
--- a/projects/Ba4.vcproj
+++ b/projects/Ba4.vcproj
@@ -107,7 +107,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -238,7 +238,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Ba5.vcproj b/projects/Ba5.vcproj
index b0e8f5d3b..349ef8d1c 100755
--- a/projects/Ba5.vcproj
+++ b/projects/Ba5.vcproj
@@ -107,7 +107,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -239,7 +239,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Ba6.vcproj b/projects/Ba6.vcproj
index 87ef53064..8fa9be504 100755
--- a/projects/Ba6.vcproj
+++ b/projects/Ba6.vcproj
@@ -106,7 +106,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -238,7 +238,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Ba7.vcproj b/projects/Ba7.vcproj
index 4c43f7151..c7ecbef4f 100755
--- a/projects/Ba7.vcproj
+++ b/projects/Ba7.vcproj
@@ -107,7 +107,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -239,7 +239,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Bacnv.vcproj b/projects/Bacnv.vcproj
index f277d67fe..2f4091ef0 100755
--- a/projects/Bacnv.vcproj
+++ b/projects/Bacnv.vcproj
@@ -107,7 +107,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -238,7 +238,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Bainst.vcproj b/projects/Bainst.vcproj
index 38c1c7664..398139305 100755
--- a/projects/Bainst.vcproj
+++ b/projects/Bainst.vcproj
@@ -92,7 +92,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -209,7 +209,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/BaseServ.vcproj b/projects/BaseServ.vcproj
index 33fe15ed7..09c4137e6 100755
--- a/projects/BaseServ.vcproj
+++ b/projects/BaseServ.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\wx287\lib\vc_dll\mswd,..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\lib\vc_dll\mswd,..\..\wx289\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;__WINDOWS__;__WXMSW__;DEBUG=1;__WXDEBUG__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT;WXUSINGDLL=1"
 				MinimalRebuild="true"
 				RuntimeLibrary="3"
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="2057"
-				AdditionalIncludeDirectories="..\server;..\..\wx287\include"
+				AdditionalIncludeDirectories="..\server;..\..\wx289\include"
 				ResourceOutputFileName="..\server\DebugDLL/server.res"
 			/>
 			<Tool
@@ -78,7 +78,7 @@
 				OutputFile="../exed/servers/BaseServ.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\wx287\lib"
+				AdditionalLibraryDirectories="..\..\wx289\lib"
 				IgnoreDefaultLibraryNames="libcd.lib,libcid.lib"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\..\Debug\DebugServers/BaseServ.pdb"
@@ -165,7 +165,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="2057"
-				AdditionalIncludeDirectories="\U\Luca\r020200\server;..\..\wx287\include"
+				AdditionalIncludeDirectories="\U\Luca\r020200\server;..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -242,7 +242,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="4"
-				AdditionalIncludeDirectories="..\..\wx287\lib\vc_dll\msw,..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\lib\vc_dll\msw,..\..\wx289\include"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;__WINDOWS__;__WXMSW__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT;WXUSINGDLL=1"
 				RuntimeLibrary="2"
 				PrecompiledHeaderFile=".\..\Release\ReleaseDLLServers/BaseServ.pch"
@@ -259,7 +259,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="2057"
-				AdditionalIncludeDirectories="\U\Luca\r020200\server;..\..\wx287\include"
+				AdditionalIncludeDirectories="\U\Luca\r020200\server;..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -270,7 +270,7 @@
 				OutputFile="D:\Release\campo100/servers/BaseServ.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\wx287\lib"
+				AdditionalLibraryDirectories="..\..\wx289\lib"
 				IgnoreDefaultLibraryNames="libc.lib,libci.lib"
 				ProgramDatabaseFile=".\..\Release\ReleaseDLLServers/BaseServ.pdb"
 				SubSystem="2"
@@ -336,7 +336,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="\wx287\include"
+				AdditionalIncludeDirectories="\wx289\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;__WINDOWS__;__WXMSW__;DEBUG=1;__WXDEBUG__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT"
 				MinimalRebuild="true"
 				RuntimeLibrary="1"
@@ -356,14 +356,14 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="2057"
-				AdditionalIncludeDirectories="\U\Luca\r020200\server;..\..\wx287\include"
+				AdditionalIncludeDirectories="\U\Luca\r020200\server;..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/libpath:&quot;/wx287/lib&quot;"
+				AdditionalOptions="/libpath:&quot;/wx289/lib&quot;"
 				AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib"
 				OutputFile="Debug/server.exe"
 				LinkIncremental="2"
diff --git a/projects/Cacnv.vcproj b/projects/Cacnv.vcproj
index a1318f798..e4e4f49da 100755
--- a/projects/Cacnv.vcproj
+++ b/projects/Cacnv.vcproj
@@ -92,7 +92,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -208,7 +208,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Cg0.vcproj b/projects/Cg0.vcproj
index 418c82196..e55684162 100755
--- a/projects/Cg0.vcproj
+++ b/projects/Cg0.vcproj
@@ -92,7 +92,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -209,7 +209,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Cg1.vcproj b/projects/Cg1.vcproj
index 94342a796..36ff6f0bf 100755
--- a/projects/Cg1.vcproj
+++ b/projects/Cg1.vcproj
@@ -92,7 +92,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -209,7 +209,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Cg2.vcproj b/projects/Cg2.vcproj
index 81fad73d0..39fd02ac5 100755
--- a/projects/Cg2.vcproj
+++ b/projects/Cg2.vcproj
@@ -93,7 +93,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -209,7 +209,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Cg3.vcproj b/projects/Cg3.vcproj
index d8a479949..8b00d1c69 100755
--- a/projects/Cg3.vcproj
+++ b/projects/Cg3.vcproj
@@ -92,7 +92,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -210,7 +210,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Cg4.vcproj b/projects/Cg4.vcproj
index a4100261d..b51058071 100755
--- a/projects/Cg4.vcproj
+++ b/projects/Cg4.vcproj
@@ -92,7 +92,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -208,7 +208,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Cg5.vcproj b/projects/Cg5.vcproj
index 29e448635..14d317f0f 100755
--- a/projects/Cg5.vcproj
+++ b/projects/Cg5.vcproj
@@ -92,7 +92,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -209,7 +209,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Cg6.vcproj b/projects/Cg6.vcproj
index b0e0a2ee1..25dd2bd58 100755
--- a/projects/Cg6.vcproj
+++ b/projects/Cg6.vcproj
@@ -92,7 +92,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -209,7 +209,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Cg7.vcproj b/projects/Cg7.vcproj
index c16ffd4b0..13d15354b 100755
--- a/projects/Cg7.vcproj
+++ b/projects/Cg7.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Cgp1.vcproj b/projects/Cgp1.vcproj
index c2a42838a..eb9e0ce44 100755
--- a/projects/Cgp1.vcproj
+++ b/projects/Cgp1.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Cgp2.vcproj b/projects/Cgp2.vcproj
index f6f5f7f55..c125bb8be 100755
--- a/projects/Cgp2.vcproj
+++ b/projects/Cgp2.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Cgp3.vcproj b/projects/Cgp3.vcproj
index 5512fdea8..40e522f0e 100755
--- a/projects/Cgp3.vcproj
+++ b/projects/Cgp3.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Database.vcproj b/projects/Database.vcproj
index 200ef4cea..b0000f521 100755
--- a/projects/Database.vcproj
+++ b/projects/Database.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\wx287\lib\vc_dll\mswd,..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\lib\vc_dll\mswd,..\..\wx289\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;__WINDOWS__;__WXMSW__;DEBUG=1;__WXDEBUG__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT;WXUSINGDLL=1"
 				MinimalRebuild="true"
 				RuntimeLibrary="3"
@@ -65,7 +65,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="2057"
-				AdditionalIncludeDirectories="..\server;..\..\wx287\include"
+				AdditionalIncludeDirectories="..\server;..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -76,7 +76,7 @@
 				OutputFile="../exed/servers/DataBase.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\wx287\lib"
+				AdditionalLibraryDirectories="..\..\wx289\lib"
 				IgnoreDefaultLibraryNames="libcd.lib,libcid.lib"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\..\Debug\DebugServers/DataBase.pdb"
@@ -143,7 +143,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="4"
-				AdditionalIncludeDirectories="..\..\wx287\lib\vc_dll\msw,..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\lib\vc_dll\msw,..\..\wx289\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;__WINDOWS__;__WXMSW__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT;WXUSINGDLL=1"
 				RuntimeLibrary="2"
 				PrecompiledHeaderFile=".\..\Release\ReleaseDLLServers/Database.pch"
@@ -160,7 +160,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="2057"
-				AdditionalIncludeDirectories="..\server;..\..\wx287\include"
+				AdditionalIncludeDirectories="..\server;..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -171,7 +171,7 @@
 				OutputFile="D:\Release\campo100/servers/DataBase.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\wx287\lib"
+				AdditionalLibraryDirectories="..\..\wx289\lib"
 				IgnoreDefaultLibraryNames="libc.lib,libci.lib"
 				ProgramDatabaseFile=".\..\Release\ReleaseDLLServers/DataBase.pdb"
 				SubSystem="2"
@@ -257,14 +257,14 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="2057"
-				AdditionalIncludeDirectories="\U\Luca\r020200\server;..\..\wx287\include"
+				AdditionalIncludeDirectories="\U\Luca\r020200\server;..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/libpath:&quot;/wx287/lib&quot;"
+				AdditionalOptions="/libpath:&quot;/wx289/lib&quot;"
 				AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib \wx233\lib\wxmsw233d.lib"
 				OutputFile="../exe/servers/DataBase.exe"
 				LinkIncremental="2"
@@ -355,7 +355,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="2057"
-				AdditionalIncludeDirectories="\U\Luca\r020200\server;..\..\wx287\include"
+				AdditionalIncludeDirectories="\U\Luca\r020200\server;..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -555,7 +555,7 @@
 					Name="VCResourceCompilerTool"
 					PreprocessorDefinitions=""
 					Culture="1040"
-					AdditionalIncludeDirectories="\U\Luca\R_10_00\server;\U\Release\A_04_00\server;\U\Luca\A_02_02\server;\U\Luca\R_02_01\server;\U\Luca\r030200\server;\U\Luca\r020200.aga\server;\U\Luca\wx287\include;$(NoInherit)"
+					AdditionalIncludeDirectories="\U\Luca\R_10_00\server;\U\Release\A_04_00\server;\U\Luca\A_02_02\server;\U\Luca\R_02_01\server;\U\Luca\r030200\server;\U\Luca\r020200.aga\server;\U\Luca\wx289\include;$(NoInherit)"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -565,7 +565,7 @@
 					Name="VCResourceCompilerTool"
 					PreprocessorDefinitions=""
 					Culture="1040"
-					AdditionalIncludeDirectories="\U\Luca\R_10_00\server;\U\Release\A_04_00\server;\U\Luca\A_02_02\server;\U\Luca\R_02_01\server;\U\Luca\r030200\server;\U\Luca\r020200.aga\server;\U\Luca\wx287\include;$(NoInherit)"
+					AdditionalIncludeDirectories="\U\Luca\R_10_00\server;\U\Release\A_04_00\server;\U\Luca\A_02_02\server;\U\Luca\R_02_01\server;\U\Luca\r030200\server;\U\Luca\r020200.aga\server;\U\Luca\wx289\include;$(NoInherit)"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -588,7 +588,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_dll\wxbase28.lib"
+			RelativePath="..\..\wx289\lib\vc_dll\wxbase28.lib"
 			>
 			<FileConfiguration
 				Name="Debug DLL|Win32"
@@ -600,7 +600,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_dll\wxbase28_net.lib"
+			RelativePath="..\..\wx289\lib\vc_dll\wxbase28_net.lib"
 			>
 			<FileConfiguration
 				Name="Debug DLL|Win32"
@@ -612,7 +612,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_dll\wxbase28_odbc.lib"
+			RelativePath="..\..\wx289\lib\vc_dll\wxbase28_odbc.lib"
 			>
 			<FileConfiguration
 				Name="Debug DLL|Win32"
@@ -624,7 +624,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_dll\wxbase28d.lib"
+			RelativePath="..\..\wx289\lib\vc_dll\wxbase28d.lib"
 			>
 			<FileConfiguration
 				Name="Release DLL|Win32"
@@ -636,7 +636,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_dll\wxbase28d_net.lib"
+			RelativePath="..\..\wx289\lib\vc_dll\wxbase28d_net.lib"
 			>
 			<FileConfiguration
 				Name="Release DLL|Win32"
@@ -648,7 +648,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_dll\wxbase28d_odbc.lib"
+			RelativePath="..\..\wx289\lib\vc_dll\wxbase28d_odbc.lib"
 			>
 			<FileConfiguration
 				Name="Release DLL|Win32"
@@ -660,7 +660,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_dll\wxmsw28_adv.lib"
+			RelativePath="..\..\wx289\lib\vc_dll\wxmsw28_adv.lib"
 			>
 			<FileConfiguration
 				Name="Debug DLL|Win32"
@@ -672,7 +672,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_dll\wxmsw28_core.lib"
+			RelativePath="..\..\wx289\lib\vc_dll\wxmsw28_core.lib"
 			>
 			<FileConfiguration
 				Name="Debug DLL|Win32"
@@ -684,7 +684,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_dll\wxmsw28d_adv.lib"
+			RelativePath="..\..\wx289\lib\vc_dll\wxmsw28d_adv.lib"
 			>
 			<FileConfiguration
 				Name="Release DLL|Win32"
@@ -696,7 +696,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_dll\wxmsw28d_core.lib"
+			RelativePath="..\..\wx289\lib\vc_dll\wxmsw28d_core.lib"
 			>
 			<FileConfiguration
 				Name="Release DLL|Win32"
diff --git a/projects/Diction.vcproj b/projects/Diction.vcproj
index 2a214932a..b702b8fa1 100755
--- a/projects/Diction.vcproj
+++ b/projects/Diction.vcproj
@@ -47,7 +47,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\wx287\lib\vc_dll\mswd,..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\lib\vc_dll\mswd,..\..\wx289\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;__WINDOWS__;__WXMSW__;DEBUG=1;__WXDEBUG__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT;WXUSINGDLL=1"
 				MinimalRebuild="true"
 				RuntimeLibrary="3"
@@ -63,7 +63,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="2057"
-				AdditionalIncludeDirectories="..\server;..\..\wx287\include"
+				AdditionalIncludeDirectories="..\server;..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -74,7 +74,7 @@
 				OutputFile="../exed/servers/Diction.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\wx287\lib"
+				AdditionalLibraryDirectories="..\..\wx289\lib"
 				IgnoreDefaultLibraryNames="libcd.lib,libcid.lib"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\..\Debug\DebugServers/Diction.pdb"
@@ -142,7 +142,7 @@
 				Optimization="1"
 				InlineFunctionExpansion="2"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="..\..\wx287\lib\vc_lib\mswd,..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\lib\vc_lib\mswd,..\..\wx289\include"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;__WINDOWS__;__WXMSW__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -158,7 +158,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="2057"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="4"
-				AdditionalIncludeDirectories="..\..\wx287\lib\vc_dll\msw,..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\lib\vc_dll\msw,..\..\wx289\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;__WINDOWS__;__WXMSW__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT;WXUSINGDLL=1"
 				RuntimeLibrary="2"
 				PrecompiledHeaderFile=".\..\Release\ReleaseDLLServers/Diction.pch"
@@ -248,7 +248,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="2057"
-				AdditionalIncludeDirectories="..\server;..\..\wx287\include"
+				AdditionalIncludeDirectories="..\server;..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -259,7 +259,7 @@
 				OutputFile="D:\Release\campo100/servers/Diction.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\wx287\lib"
+				AdditionalLibraryDirectories="..\..\wx289\lib"
 				IgnoreDefaultLibraryNames="libc.lib,libci.lib"
 				ProgramDatabaseFile=".\..\Release\ReleaseDLLServers/Diction.pdb"
 				SubSystem="2"
@@ -324,7 +324,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\wx287\lib\vc_lib\mswd,..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\lib\vc_lib\mswd,..\..\wx289\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;__WINDOWS__;__WXMSW__;DEBUG=1;__WXDEBUG__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT"
 				MinimalRebuild="true"
 				RuntimeLibrary="1"
@@ -341,14 +341,14 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="2057"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/libpath:&quot;/wx287/lib&quot;"
+				AdditionalOptions="/libpath:&quot;/wx289/lib&quot;"
 				OutputFile="../exed/servers/Diction.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
diff --git a/projects/Ef0.vcproj b/projects/Ef0.vcproj
index 421aa2f9a..c47103a70 100755
--- a/projects/Ef0.vcproj
+++ b/projects/Ef0.vcproj
@@ -120,7 +120,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -263,7 +263,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/In0.vcproj b/projects/In0.vcproj
index 8e763d329..dae308edc 100755
--- a/projects/In0.vcproj
+++ b/projects/In0.vcproj
@@ -122,7 +122,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -269,7 +269,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -632,10 +632,6 @@
 			Name="Forms"
 			Filter="frm"
 			>
-			<File
-				RelativePath="..\in\batbint.frm"
-				>
-			</File>
 			<File
 				RelativePath="..\in\in0100a.frm"
 				>
diff --git a/projects/Lurch.vcproj b/projects/Lurch.vcproj
index ec1e92863..a46535fa2 100755
--- a/projects/Lurch.vcproj
+++ b/projects/Lurch.vcproj
@@ -47,7 +47,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\wx287\lib\vc_dll\mswd,..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\lib\vc_dll\mswd,..\..\wx289\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;__WINDOWS__;__WXMSW__;DEBUG=1;__WXDEBUG__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT;WXUSINGDLL=1"
 				MinimalRebuild="true"
 				RuntimeLibrary="3"
@@ -64,7 +64,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="2057"
-				AdditionalIncludeDirectories="..\server;..\..\wx287\include"
+				AdditionalIncludeDirectories="..\server;..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -75,7 +75,7 @@
 				OutputFile="../exed/servers/Lurch.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\wx287\lib"
+				AdditionalLibraryDirectories="..\..\wx289\lib"
 				IgnoreDefaultLibraryNames="libcd.lib,libcid.lib"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\..\Debug\DebugServers/Lurch.pdb"
@@ -141,7 +141,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\wx287\lib\vc_lib\mswd,..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\lib\vc_lib\mswd,..\..\wx289\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;__WINDOWS__;__WXMSW__;DEBUG=1;__WXDEBUG__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT"
 				MinimalRebuild="true"
 				RuntimeLibrary="1"
@@ -158,14 +158,14 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="2057"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/libpath:&quot;/wx287/lib&quot;"
+				AdditionalOptions="/libpath:&quot;/wx289/lib&quot;"
 				OutputFile="../exed/servers/Lurch.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -236,7 +236,7 @@
 				Optimization="1"
 				InlineFunctionExpansion="2"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="..\..\wx287\lib\vc_lib\mswd,..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\lib\vc_lib\mswd,..\..\wx289\include"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;__WINDOWS__;__WXMSW__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -252,7 +252,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="2057"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -328,7 +328,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="4"
-				AdditionalIncludeDirectories="..\..\wx287\lib\vc_dll\msw,..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\lib\vc_dll\msw,..\..\wx289\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;__WINDOWS__;__WXMSW__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT;WXUSINGDLL=1"
 				RuntimeLibrary="2"
 				PrecompiledHeaderFile=".\..\Release\ReleaseDLLServers/Lurch.pch"
@@ -342,7 +342,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="2057"
-				AdditionalIncludeDirectories="..\server;..\..\wx287\include"
+				AdditionalIncludeDirectories="..\server;..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -353,7 +353,7 @@
 				OutputFile="D:\Release\campo100/servers/Lurch.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\wx287\lib"
+				AdditionalLibraryDirectories="..\..\wx289\lib"
 				IgnoreDefaultLibraryNames="libc.lib,libci.lib"
 				ProgramDatabaseFile=".\..\Release\ReleaseDLLServers/Lurch.pdb"
 				SubSystem="2"
@@ -497,7 +497,7 @@
 					Name="VCResourceCompilerTool"
 					PreprocessorDefinitions=""
 					Culture="1040"
-					AdditionalIncludeDirectories="\U\Luca\R_10_00\server;\U\Release\A_04_00\server;\U\Luca\A_02_02\server;\U\Luca\R_02_01\server;\U\Luca\r030200\server;\U\Luca\r020200.aga\server;\U\Luca\wx287\include;$(NoInherit)"
+					AdditionalIncludeDirectories="\U\Luca\R_10_00\server;\U\Release\A_04_00\server;\U\Luca\A_02_02\server;\U\Luca\R_02_01\server;\U\Luca\r030200\server;\U\Luca\r020200.aga\server;\U\Luca\wx289\include;$(NoInherit)"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -525,7 +525,7 @@
 					Name="VCResourceCompilerTool"
 					PreprocessorDefinitions=""
 					Culture="1040"
-					AdditionalIncludeDirectories="\U\Luca\R_10_00\server;\U\Release\A_04_00\server;\U\Luca\A_02_02\server;\U\Luca\R_02_01\server;\U\Luca\r030200\server;\U\Luca\r020200.aga\server;\U\Luca\wx287\include;$(NoInherit)"
+					AdditionalIncludeDirectories="\U\Luca\R_10_00\server;\U\Release\A_04_00\server;\U\Luca\A_02_02\server;\U\Luca\R_02_01\server;\U\Luca\r030200\server;\U\Luca\r020200.aga\server;\U\Luca\wx289\include;$(NoInherit)"
 				/>
 			</FileConfiguration>
 		</File>
diff --git a/projects/Or1.vcproj b/projects/Or1.vcproj
index 536495a0b..96cea28b7 100755
--- a/projects/Or1.vcproj
+++ b/projects/Or1.vcproj
@@ -107,7 +107,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -238,7 +238,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Postman.vcproj b/projects/Postman.vcproj
index 6aac8abbb..6d3f54cbc 100755
--- a/projects/Postman.vcproj
+++ b/projects/Postman.vcproj
@@ -50,7 +50,7 @@
 				Optimization="1"
 				InlineFunctionExpansion="2"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="..\..\wx287\lib\vc_lib\mswd,..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\lib\vc_lib\mswd,..\..\wx289\include"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;__WINDOWS__;__WXMSW__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="2057"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -142,7 +142,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\wx287\lib\vc_dll\mswd,..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\lib\vc_dll\mswd,..\..\wx289\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;__WINDOWS__;__WXMSW__;DEBUG=1;__WXDEBUG__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT;WXUSINGDLL=1"
 				MinimalRebuild="true"
 				RuntimeLibrary="3"
@@ -159,7 +159,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="2057"
-				AdditionalIncludeDirectories="..\server;..\..\wx287\include"
+				AdditionalIncludeDirectories="..\server;..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -170,7 +170,7 @@
 				OutputFile="../exed/servers/Postman.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\wx287\lib"
+				AdditionalLibraryDirectories="..\..\wx289\lib"
 				IgnoreDefaultLibraryNames="libcd.lib,libcid.lib"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\..\Debug\DebugServers/Postman.pdb"
@@ -236,7 +236,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\wx287\lib\vc_lib\mswd,..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\lib\vc_lib\mswd,..\..\wx289\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;__WINDOWS__;__WXMSW__;DEBUG=1;__WXDEBUG__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT"
 				MinimalRebuild="true"
 				RuntimeLibrary="1"
@@ -253,14 +253,14 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="2057"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/libpath:&quot;/wx287/lib&quot;"
+				AdditionalOptions="/libpath:&quot;/wx289/lib&quot;"
 				OutputFile="../exed/servers/Postman.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -329,7 +329,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="4"
-				AdditionalIncludeDirectories="..\..\wx287\lib\vc_dll\msw,..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\lib\vc_dll\msw,..\..\wx289\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;__WINDOWS__;__WXMSW__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT;WXUSINGDLL=1"
 				RuntimeLibrary="2"
 				PrecompiledHeaderFile=".\..\Release\ReleaseDLLServers/Postman.pch"
@@ -343,7 +343,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="2057"
-				AdditionalIncludeDirectories="..\server;..\..\wx287\include"
+				AdditionalIncludeDirectories="..\server;..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -354,7 +354,7 @@
 				OutputFile="D:\Release\campo100/servers/Postman.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\wx287\lib"
+				AdditionalLibraryDirectories="..\..\wx289\lib"
 				IgnoreDefaultLibraryNames="libc.lib,libci.lib"
 				ProgramDatabaseFile=".\..\Release\ReleaseDLLServers/Postman.pdb"
 				SubSystem="2"
diff --git a/projects/Sc0.vcproj b/projects/Sc0.vcproj
index 5ccae580d..352800770 100755
--- a/projects/Sc0.vcproj
+++ b/projects/Sc0.vcproj
@@ -107,7 +107,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -238,7 +238,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Sc1.vcproj b/projects/Sc1.vcproj
index 705a01fca..bc17b5b4a 100755
--- a/projects/Sc1.vcproj
+++ b/projects/Sc1.vcproj
@@ -107,7 +107,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -239,7 +239,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="\wx287\include;..\..\wx287\include"
+				AdditionalIncludeDirectories="\wx289\include;..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -533,7 +533,7 @@
 				<Tool
 					Name="VCResourceCompilerTool"
 					PreprocessorDefinitions=""
-					AdditionalIncludeDirectories="..\..\wx287\include;$(NoInherit)"
+					AdditionalIncludeDirectories="..\..\wx289\include;$(NoInherit)"
 				/>
 			</FileConfiguration>
 		</File>
diff --git a/projects/Sc2.vcproj b/projects/Sc2.vcproj
index bbe945ed7..4d2d91a1b 100755
--- a/projects/Sc2.vcproj
+++ b/projects/Sc2.vcproj
@@ -107,7 +107,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -239,7 +239,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Sc3.vcproj b/projects/Sc3.vcproj
index f8de0472b..b0eaf7549 100755
--- a/projects/Sc3.vcproj
+++ b/projects/Sc3.vcproj
@@ -107,7 +107,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -239,7 +239,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="\wx287\include;..\..\wx287\include"
+				AdditionalIncludeDirectories="\wx289\include;..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -476,7 +476,7 @@
 				<Tool
 					Name="VCResourceCompilerTool"
 					PreprocessorDefinitions=""
-					AdditionalIncludeDirectories="..\..\wx287\include;$(NoInherit)"
+					AdditionalIncludeDirectories="..\..\wx289\include;$(NoInherit)"
 				/>
 			</FileConfiguration>
 		</File>
diff --git a/projects/ServerLib.vcproj b/projects/ServerLib.vcproj
index 0efff8fde..b2da42235 100755
--- a/projects/ServerLib.vcproj
+++ b/projects/ServerLib.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="\u\luca\wx287\lib\vc_lib\mswd;\u\luca\wx287\include"
+				AdditionalIncludeDirectories="\u\luca\wx289\lib\vc_lib\mswd;\u\luca\wx289\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -56,7 +56,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -107,7 +107,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="\u\luca\wx287\lib\vc_lib\msw;\u\luca\wx287\include"
+				AdditionalIncludeDirectories="\u\luca\wx289\lib\vc_lib\msw;\u\luca\wx289\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
@@ -173,7 +173,7 @@
 			Filter="lib"
 			>
 			<File
-				RelativePath="..\..\wx287\lib\vc_lib\wxbase28.lib"
+				RelativePath="..\..\wx289\lib\vc_lib\wxbase28.lib"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -185,7 +185,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\wx287\lib\vc_lib\wxbase28_net.lib"
+				RelativePath="..\..\wx289\lib\vc_lib\wxbase28_net.lib"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -197,7 +197,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\wx287\lib\vc_lib\wxbase28_odbc.lib"
+				RelativePath="..\..\wx289\lib\vc_lib\wxbase28_odbc.lib"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -209,7 +209,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\wx287\lib\vc_lib\wxbase28_xml.lib"
+				RelativePath="..\..\wx289\lib\vc_lib\wxbase28_xml.lib"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -221,7 +221,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\wx287\lib\vc_lib\wxbase28d.lib"
+				RelativePath="..\..\wx289\lib\vc_lib\wxbase28d.lib"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -233,7 +233,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\wx287\lib\vc_lib\wxbase28d_net.lib"
+				RelativePath="..\..\wx289\lib\vc_lib\wxbase28d_net.lib"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -245,7 +245,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\wx287\lib\vc_lib\wxbase28d_odbc.lib"
+				RelativePath="..\..\wx289\lib\vc_lib\wxbase28d_odbc.lib"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -257,7 +257,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\wx287\lib\vc_lib\wxbase28d_xml.lib"
+				RelativePath="..\..\wx289\lib\vc_lib\wxbase28d_xml.lib"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -269,7 +269,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\wx287\lib\vc_lib\wxjpeg.lib"
+				RelativePath="..\..\wx289\lib\vc_lib\wxjpeg.lib"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -281,7 +281,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\wx287\lib\vc_lib\wxjpegd.lib"
+				RelativePath="..\..\wx289\lib\vc_lib\wxjpegd.lib"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -293,7 +293,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\wx287\lib\vc_lib\wxmsw28_adv.lib"
+				RelativePath="..\..\wx289\lib\vc_lib\wxmsw28_adv.lib"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -305,7 +305,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\wx287\lib\vc_lib\wxmsw28_core.lib"
+				RelativePath="..\..\wx289\lib\vc_lib\wxmsw28_core.lib"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -317,7 +317,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\wx287\lib\vc_lib\wxmsw28d_adv.lib"
+				RelativePath="..\..\wx289\lib\vc_lib\wxmsw28d_adv.lib"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -329,7 +329,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\wx287\lib\vc_lib\wxmsw28d_core.lib"
+				RelativePath="..\..\wx289\lib\vc_lib\wxmsw28d_core.lib"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -341,7 +341,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\wx287\lib\vc_lib\wxpng.lib"
+				RelativePath="..\..\wx289\lib\vc_lib\wxpng.lib"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -353,7 +353,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\wx287\lib\vc_lib\wxpngd.lib"
+				RelativePath="..\..\wx289\lib\vc_lib\wxpngd.lib"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -365,7 +365,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\wx287\lib\vc_lib\wxtiff.lib"
+				RelativePath="..\..\wx289\lib\vc_lib\wxtiff.lib"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -377,7 +377,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\wx287\lib\vc_lib\wxtiffd.lib"
+				RelativePath="..\..\wx289\lib\vc_lib\wxtiffd.lib"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -389,7 +389,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\wx287\lib\vc_lib\wxzlib.lib"
+				RelativePath="..\..\wx289\lib\vc_lib\wxzlib.lib"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -401,7 +401,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\wx287\lib\vc_lib\wxzlibd.lib"
+				RelativePath="..\..\wx289\lib\vc_lib\wxzlibd.lib"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
diff --git a/projects/Setup.vcproj b/projects/Setup.vcproj
index 2d7764dbd..5f5a2de97 100755
--- a/projects/Setup.vcproj
+++ b/projects/Setup.vcproj
@@ -92,7 +92,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\wx287\lib\vc_lib\mswd;..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\lib\vc_lib\mswd;..\..\wx289\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -108,7 +108,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -221,7 +221,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\..\wx287\lib\vc_lib\msw;..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\lib\vc_lib\msw;..\..\wx289\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				BasicRuntimeChecks="0"
 				RuntimeLibrary="0"
@@ -239,7 +239,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -370,7 +370,7 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_lib\wxbase28.lib"
+			RelativePath="..\..\wx289\lib\vc_lib\wxbase28.lib"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -382,7 +382,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_lib\wxbase28_net.lib"
+			RelativePath="..\..\wx289\lib\vc_lib\wxbase28_net.lib"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -394,7 +394,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_lib\wxbase28d.lib"
+			RelativePath="..\..\wx289\lib\vc_lib\wxbase28d.lib"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -406,7 +406,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_lib\wxbase28d_net.lib"
+			RelativePath="..\..\wx289\lib\vc_lib\wxbase28d_net.lib"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -418,7 +418,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_lib\wxexpat.lib"
+			RelativePath="..\..\wx289\lib\vc_lib\wxexpat.lib"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -430,7 +430,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_lib\wxexpatd.lib"
+			RelativePath="..\..\wx289\lib\vc_lib\wxexpatd.lib"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -442,7 +442,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_lib\wxjpeg.lib"
+			RelativePath="..\..\wx289\lib\vc_lib\wxjpeg.lib"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -454,7 +454,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_lib\wxjpegd.lib"
+			RelativePath="..\..\wx289\lib\vc_lib\wxjpegd.lib"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -466,7 +466,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_lib\wxmsw28_adv.lib"
+			RelativePath="..\..\wx289\lib\vc_lib\wxmsw28_adv.lib"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -478,7 +478,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_lib\wxmsw28_aui.lib"
+			RelativePath="..\..\wx289\lib\vc_lib\wxmsw28_aui.lib"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -490,7 +490,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_lib\wxmsw28_core.lib"
+			RelativePath="..\..\wx289\lib\vc_lib\wxmsw28_core.lib"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -502,7 +502,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_lib\wxmsw28_html.lib"
+			RelativePath="..\..\wx289\lib\vc_lib\wxmsw28_html.lib"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -514,7 +514,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_lib\wxmsw28d_adv.lib"
+			RelativePath="..\..\wx289\lib\vc_lib\wxmsw28d_adv.lib"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -526,7 +526,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_lib\wxmsw28d_aui.lib"
+			RelativePath="..\..\wx289\lib\vc_lib\wxmsw28d_aui.lib"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -538,7 +538,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_lib\wxmsw28d_core.lib"
+			RelativePath="..\..\wx289\lib\vc_lib\wxmsw28d_core.lib"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -550,7 +550,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_lib\wxmsw28d_html.lib"
+			RelativePath="..\..\wx289\lib\vc_lib\wxmsw28d_html.lib"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -562,7 +562,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_lib\wxpng.lib"
+			RelativePath="..\..\wx289\lib\vc_lib\wxpng.lib"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -574,7 +574,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_lib\wxpngd.lib"
+			RelativePath="..\..\wx289\lib\vc_lib\wxpngd.lib"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -586,7 +586,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_lib\wxtiff.lib"
+			RelativePath="..\..\wx289\lib\vc_lib\wxtiff.lib"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -598,7 +598,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_lib\wxtiffd.lib"
+			RelativePath="..\..\wx289\lib\vc_lib\wxtiffd.lib"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -610,7 +610,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_lib\wxzlib.lib"
+			RelativePath="..\..\wx289\lib\vc_lib\wxzlib.lib"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -622,7 +622,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_lib\wxzlibd.lib"
+			RelativePath="..\..\wx289\lib\vc_lib\wxzlibd.lib"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
diff --git a/projects/ab0.rc b/projects/ab0.rc
index 7593751ff..a92f59451 100755
--- a/projects/ab0.rc
+++ b/projects/ab0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/ab0.vcproj b/projects/ab0.vcproj
index a2ed7d7bd..33eb694d1 100755
--- a/projects/ab0.vcproj
+++ b/projects/ab0.vcproj
@@ -122,7 +122,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -268,7 +268,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ab1.rc b/projects/ab1.rc
index 7593751ff..a92f59451 100755
--- a/projects/ab1.rc
+++ b/projects/ab1.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/ab1.vcproj b/projects/ab1.vcproj
index 544475deb..0b78e2a15 100755
--- a/projects/ab1.vcproj
+++ b/projects/ab1.vcproj
@@ -67,7 +67,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ab2.rc b/projects/ab2.rc
index 7593751ff..a92f59451 100755
--- a/projects/ab2.rc
+++ b/projects/ab2.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/ab2.vcproj b/projects/ab2.vcproj
index 26d6d358f..30d97f42e 100755
--- a/projects/ab2.vcproj
+++ b/projects/ab2.vcproj
@@ -67,7 +67,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ab3.rc b/projects/ab3.rc
index 7593751ff..a92f59451 100755
--- a/projects/ab3.rc
+++ b/projects/ab3.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/ab3.vcproj b/projects/ab3.vcproj
index fa6b4c0c9..646b0c672 100755
--- a/projects/ab3.vcproj
+++ b/projects/ab3.vcproj
@@ -67,7 +67,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ba0.rc b/projects/ba0.rc
index 121bb0aad..7018c26fb 100755
--- a/projects/ba0.rc
+++ b/projects/ba0.rc
@@ -2,5 +2,5 @@
 "9013"       ICON DISCARDABLE    "../res/camposrv.ico"
 "9014"       ICON DISCARDABLE    "../res/campocln.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/ba0.vcproj b/projects/ba0.vcproj
index d3b40dab6..2c44d81b2 100755
--- a/projects/ba0.vcproj
+++ b/projects/ba0.vcproj
@@ -119,7 +119,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -264,7 +264,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ba1.rc b/projects/ba1.rc
index 7593751ff..a92f59451 100755
--- a/projects/ba1.rc
+++ b/projects/ba1.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/ba2.rc b/projects/ba2.rc
index 7593751ff..a92f59451 100755
--- a/projects/ba2.rc
+++ b/projects/ba2.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/ba3.rc b/projects/ba3.rc
index 7593751ff..a92f59451 100755
--- a/projects/ba3.rc
+++ b/projects/ba3.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/ba4.rc b/projects/ba4.rc
index 7593751ff..a92f59451 100755
--- a/projects/ba4.rc
+++ b/projects/ba4.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/ba5.rc b/projects/ba5.rc
index 7593751ff..a92f59451 100755
--- a/projects/ba5.rc
+++ b/projects/ba5.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/ba6.rc b/projects/ba6.rc
index 7593751ff..a92f59451 100755
--- a/projects/ba6.rc
+++ b/projects/ba6.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/ba7.rc b/projects/ba7.rc
index 7593751ff..a92f59451 100755
--- a/projects/ba7.rc
+++ b/projects/ba7.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/ba8.rc b/projects/ba8.rc
index 7593751ff..a92f59451 100755
--- a/projects/ba8.rc
+++ b/projects/ba8.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/ba8.vcproj b/projects/ba8.vcproj
index 723cdcb96..9cfb8a7c2 100755
--- a/projects/ba8.vcproj
+++ b/projects/ba8.vcproj
@@ -123,7 +123,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -270,7 +270,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/bacnv.rc b/projects/bacnv.rc
index 7593751ff..a92f59451 100755
--- a/projects/bacnv.rc
+++ b/projects/bacnv.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/bainst.rc b/projects/bainst.rc
index 7593751ff..a92f59451 100755
--- a/projects/bainst.rc
+++ b/projects/bainst.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/ca0.rc b/projects/ca0.rc
index 7593751ff..a92f59451 100755
--- a/projects/ca0.rc
+++ b/projects/ca0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/ca0.vcproj b/projects/ca0.vcproj
index 667a7f51c..d81832579 100755
--- a/projects/ca0.vcproj
+++ b/projects/ca0.vcproj
@@ -92,7 +92,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -209,7 +209,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ca1.rc b/projects/ca1.rc
index 7593751ff..a92f59451 100755
--- a/projects/ca1.rc
+++ b/projects/ca1.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/ca1.vcproj b/projects/ca1.vcproj
index b803a03d1..5a440f8c0 100755
--- a/projects/ca1.vcproj
+++ b/projects/ca1.vcproj
@@ -92,7 +92,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -208,7 +208,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ca2.rc b/projects/ca2.rc
index 7593751ff..a92f59451 100755
--- a/projects/ca2.rc
+++ b/projects/ca2.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/ca2.vcproj b/projects/ca2.vcproj
index e22b966b0..fcbc62cb0 100755
--- a/projects/ca2.vcproj
+++ b/projects/ca2.vcproj
@@ -92,7 +92,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -208,7 +208,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ca3.rc b/projects/ca3.rc
index 7593751ff..a92f59451 100755
--- a/projects/ca3.rc
+++ b/projects/ca3.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/ca3.vcproj b/projects/ca3.vcproj
index 6a7e61588..10e1dd3ae 100755
--- a/projects/ca3.vcproj
+++ b/projects/ca3.vcproj
@@ -92,7 +92,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -209,7 +209,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ca9.vcproj b/projects/ca9.vcproj
index d0e136c0e..3f169c1d1 100755
--- a/projects/ca9.vcproj
+++ b/projects/ca9.vcproj
@@ -92,7 +92,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -208,7 +208,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/cacnv.rc b/projects/cacnv.rc
index 7593751ff..a92f59451 100755
--- a/projects/cacnv.rc
+++ b/projects/cacnv.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/ce0.rc b/projects/ce0.rc
index 7593751ff..a92f59451 100755
--- a/projects/ce0.rc
+++ b/projects/ce0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/ce0.vcproj b/projects/ce0.vcproj
index 7c29d55d5..025b82961 100755
--- a/projects/ce0.vcproj
+++ b/projects/ce0.vcproj
@@ -92,7 +92,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -209,7 +209,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ce1.rc b/projects/ce1.rc
index 7593751ff..a92f59451 100755
--- a/projects/ce1.rc
+++ b/projects/ce1.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/ce1.vcproj b/projects/ce1.vcproj
index 831c15f7d..136cfc466 100755
--- a/projects/ce1.vcproj
+++ b/projects/ce1.vcproj
@@ -92,7 +92,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -208,7 +208,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ce2.rc b/projects/ce2.rc
index 7593751ff..a92f59451 100755
--- a/projects/ce2.rc
+++ b/projects/ce2.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/ce2.vcproj b/projects/ce2.vcproj
index 70964cac6..92c032174 100755
--- a/projects/ce2.vcproj
+++ b/projects/ce2.vcproj
@@ -92,7 +92,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -209,7 +209,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ce3.rc b/projects/ce3.rc
index 7593751ff..a92f59451 100755
--- a/projects/ce3.rc
+++ b/projects/ce3.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/ce3.vcproj b/projects/ce3.vcproj
index 7bd337b97..214b00b2b 100755
--- a/projects/ce3.vcproj
+++ b/projects/ce3.vcproj
@@ -92,7 +92,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -208,7 +208,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ce4.rc b/projects/ce4.rc
index 7593751ff..a92f59451 100755
--- a/projects/ce4.rc
+++ b/projects/ce4.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/ce4.vcproj b/projects/ce4.vcproj
index 955c3b85c..b47f1e510 100755
--- a/projects/ce4.vcproj
+++ b/projects/ce4.vcproj
@@ -92,7 +92,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -210,7 +210,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/cg0.rc b/projects/cg0.rc
index 7593751ff..a92f59451 100755
--- a/projects/cg0.rc
+++ b/projects/cg0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/cg1.rc b/projects/cg1.rc
index 7593751ff..a92f59451 100755
--- a/projects/cg1.rc
+++ b/projects/cg1.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/cg2.rc b/projects/cg2.rc
index 7593751ff..a92f59451 100755
--- a/projects/cg2.rc
+++ b/projects/cg2.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/cg3.rc b/projects/cg3.rc
index 7593751ff..a92f59451 100755
--- a/projects/cg3.rc
+++ b/projects/cg3.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/cg4.rc b/projects/cg4.rc
index 7593751ff..a92f59451 100755
--- a/projects/cg4.rc
+++ b/projects/cg4.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/cg5.rc b/projects/cg5.rc
index 7593751ff..a92f59451 100755
--- a/projects/cg5.rc
+++ b/projects/cg5.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/cg6.rc b/projects/cg6.rc
index 7593751ff..a92f59451 100755
--- a/projects/cg6.rc
+++ b/projects/cg6.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/cg7.rc b/projects/cg7.rc
index 7593751ff..a92f59451 100755
--- a/projects/cg7.rc
+++ b/projects/cg7.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/cgp1.rc b/projects/cgp1.rc
index 7593751ff..a92f59451 100755
--- a/projects/cgp1.rc
+++ b/projects/cgp1.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/cgp2.rc b/projects/cgp2.rc
index 7593751ff..a92f59451 100755
--- a/projects/cgp2.rc
+++ b/projects/cgp2.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/cgp3.rc b/projects/cgp3.rc
index 7593751ff..a92f59451 100755
--- a/projects/cgp3.rc
+++ b/projects/cgp3.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/cgp4.rc b/projects/cgp4.rc
index 7593751ff..a92f59451 100755
--- a/projects/cgp4.rc
+++ b/projects/cgp4.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/ci0.rc b/projects/ci0.rc
index 0dd7be1e4..89ab5e248 100755
--- a/projects/ci0.rc
+++ b/projects/ci0.rc
@@ -1,3 +1,3 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
\ No newline at end of file
+rcinclude ../../wx289/include/wx/msw/wx.rc
\ No newline at end of file
diff --git a/projects/ci0.vcproj b/projects/ci0.vcproj
index 7a03216ff..9029de996 100755
--- a/projects/ci0.vcproj
+++ b/projects/ci0.vcproj
@@ -92,7 +92,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -209,7 +209,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ci1.rc b/projects/ci1.rc
index 0dd7be1e4..89ab5e248 100755
--- a/projects/ci1.rc
+++ b/projects/ci1.rc
@@ -1,3 +1,3 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
\ No newline at end of file
+rcinclude ../../wx289/include/wx/msw/wx.rc
\ No newline at end of file
diff --git a/projects/ci1.vcproj b/projects/ci1.vcproj
index 7d4dc76fa..77db68778 100755
--- a/projects/ci1.vcproj
+++ b/projects/ci1.vcproj
@@ -92,7 +92,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -209,7 +209,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/cm0.rc b/projects/cm0.rc
index 7593751ff..a92f59451 100755
--- a/projects/cm0.rc
+++ b/projects/cm0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/cm1.rc b/projects/cm1.rc
index 7593751ff..a92f59451 100755
--- a/projects/cm1.rc
+++ b/projects/cm1.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/co0.rc b/projects/co0.rc
index 7593751ff..a92f59451 100755
--- a/projects/co0.rc
+++ b/projects/co0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/co0.vcproj b/projects/co0.vcproj
index 48fa84d72..bcad205c1 100755
--- a/projects/co0.vcproj
+++ b/projects/co0.vcproj
@@ -122,7 +122,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -268,7 +268,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/co1.rc b/projects/co1.rc
index 7593751ff..a92f59451 100755
--- a/projects/co1.rc
+++ b/projects/co1.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/co1.vcproj b/projects/co1.vcproj
index b71c401c3..6d212ad92 100755
--- a/projects/co1.vcproj
+++ b/projects/co1.vcproj
@@ -121,7 +121,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -267,7 +267,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/coffee.vcproj b/projects/coffee.vcproj
index b643b15a1..3c17891c4 100755
--- a/projects/coffee.vcproj
+++ b/projects/coffee.vcproj
@@ -47,7 +47,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="4"
-				AdditionalIncludeDirectories="..\..\wx287\lib\vc_dll\msw,..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\lib\vc_dll\msw,..\..\wx289\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;__WINDOWS__;__WXMSW__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT;WXUSINGDLL=1"
 				RuntimeLibrary="2"
 				PrecompiledHeaderFile=".\..\Release\ReleaseDLLServers/coffee.pch"
@@ -61,7 +61,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="2057"
-				AdditionalIncludeDirectories="..\server;..\..\wx287\include"
+				AdditionalIncludeDirectories="..\server;..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -72,7 +72,7 @@
 				OutputFile="D:\Release\campo100/servers/Coffee.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\wx287\lib"
+				AdditionalLibraryDirectories="..\..\wx289\lib"
 				IgnoreDefaultLibraryNames="libc.lib,libci.lib"
 				ProgramDatabaseFile=".\..\Release\ReleaseDLLServers/Coffee.pdb"
 				SubSystem="2"
@@ -137,7 +137,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\wx287\lib\vc_lib\mswd,..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\lib\vc_lib\mswd,..\..\wx289\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;__WINDOWS__;__WXMSW__;DEBUG=1;__WXDEBUG__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT"
 				MinimalRebuild="true"
 				RuntimeLibrary="1"
@@ -154,14 +154,14 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="2057"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/libpath:&quot;/wx287/lib&quot;"
+				AdditionalOptions="/libpath:&quot;/wx289/lib&quot;"
 				AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib"
 				OutputFile="../exed/servers/Coffee.exe"
 				LinkIncremental="2"
@@ -233,7 +233,7 @@
 				Optimization="1"
 				InlineFunctionExpansion="2"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="..\..\wx287\lib\vc_lib\mswd,..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\lib\vc_lib\mswd,..\..\wx289\include"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;__WINDOWS__;__WXMSW__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -249,7 +249,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="2057"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -326,7 +326,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\wx287\lib\vc_dll\mswd,..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\lib\vc_dll\mswd,..\..\wx289\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;__WINDOWS__;__WXMSW__;DEBUG=1;__WXDEBUG__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT;WXUSINGDLL=1"
 				MinimalRebuild="true"
 				RuntimeLibrary="3"
@@ -342,7 +342,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="2057"
-				AdditionalIncludeDirectories="..\server;..\..\wx287\include"
+				AdditionalIncludeDirectories="..\server;..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -353,7 +353,7 @@
 				OutputFile="../exed/servers/Coffee.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\wx287\lib"
+				AdditionalLibraryDirectories="..\..\wx289\lib"
 				IgnoreDefaultLibraryNames="libcd.lib,libcid.lib"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\..\Debug\DebugServers/Coffee.pdb"
@@ -538,7 +538,7 @@
 					Name="VCResourceCompilerTool"
 					PreprocessorDefinitions=""
 					Culture="1040"
-					AdditionalIncludeDirectories="\U\Luca\R_10_00\server;\U\Release\A_04_00\server;\U\Luca\A_02_02\server;\U\Luca\R_02_01\server;\U\Luca\r030200\server;\U\Luca\r020200.aga\server;\U\Luca\wx287\include;$(NoInherit)"
+					AdditionalIncludeDirectories="\U\Luca\R_10_00\server;\U\Release\A_04_00\server;\U\Luca\A_02_02\server;\U\Luca\R_02_01\server;\U\Luca\r030200\server;\U\Luca\r020200.aga\server;\U\Luca\wx289\include;$(NoInherit)"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -566,7 +566,7 @@
 					Name="VCResourceCompilerTool"
 					PreprocessorDefinitions=""
 					Culture="1040"
-					AdditionalIncludeDirectories="\U\Luca\R_10_00\server;\U\Release\A_04_00\server;\U\Luca\A_02_02\server;\U\Luca\R_02_01\server;\U\Luca\r030200\server;\U\Luca\r020200.aga\server;\U\Luca\wx287\include;$(NoInherit)"
+					AdditionalIncludeDirectories="\U\Luca\R_10_00\server;\U\Release\A_04_00\server;\U\Luca\A_02_02\server;\U\Luca\R_02_01\server;\U\Luca\r030200\server;\U\Luca\r020200.aga\server;\U\Luca\wx289\include;$(NoInherit)"
 				/>
 			</FileConfiguration>
 		</File>
diff --git a/projects/crpa0.rc b/projects/crpa0.rc
index 7593751ff..a92f59451 100755
--- a/projects/crpa0.rc
+++ b/projects/crpa0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/crpa0.vcproj b/projects/crpa0.vcproj
index c295277f6..f7a8f1e24 100755
--- a/projects/crpa0.vcproj
+++ b/projects/crpa0.vcproj
@@ -68,7 +68,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/crpa1.rc b/projects/crpa1.rc
index 7593751ff..a92f59451 100755
--- a/projects/crpa1.rc
+++ b/projects/crpa1.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/crpa1.vcproj b/projects/crpa1.vcproj
index ef5304dad..b0a021b78 100755
--- a/projects/crpa1.vcproj
+++ b/projects/crpa1.vcproj
@@ -67,7 +67,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -164,7 +164,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/db0.rc b/projects/db0.rc
index 7593751ff..a92f59451 100755
--- a/projects/db0.rc
+++ b/projects/db0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/db0.vcproj b/projects/db0.vcproj
index 93cdf379f..309ddc8b1 100755
--- a/projects/db0.vcproj
+++ b/projects/db0.vcproj
@@ -119,7 +119,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -262,7 +262,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/db1.rc b/projects/db1.rc
index 7593751ff..a92f59451 100755
--- a/projects/db1.rc
+++ b/projects/db1.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/db1.vcproj b/projects/db1.vcproj
index 9767a2503..504b293e6 100755
--- a/projects/db1.vcproj
+++ b/projects/db1.vcproj
@@ -107,7 +107,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -238,7 +238,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/db2.rc b/projects/db2.rc
index 7593751ff..a92f59451 100755
--- a/projects/db2.rc
+++ b/projects/db2.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/db2.vcproj b/projects/db2.vcproj
index 870e243b1..7f5788b53 100755
--- a/projects/db2.vcproj
+++ b/projects/db2.vcproj
@@ -107,7 +107,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -239,7 +239,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/dl0.rc b/projects/dl0.rc
index 7593751ff..a92f59451 100755
--- a/projects/dl0.rc
+++ b/projects/dl0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/dlinst.rc b/projects/dlinst.rc
index 7593751ff..a92f59451 100755
--- a/projects/dlinst.rc
+++ b/projects/dlinst.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/dt0.rc b/projects/dt0.rc
index 7593751ff..a92f59451 100755
--- a/projects/dt0.rc
+++ b/projects/dt0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/dt0.vcproj b/projects/dt0.vcproj
index f274d5f49..840a91e26 100755
--- a/projects/dt0.vcproj
+++ b/projects/dt0.vcproj
@@ -108,7 +108,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -239,7 +239,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ef0.rc b/projects/ef0.rc
index 7593751ff..a92f59451 100755
--- a/projects/ef0.rc
+++ b/projects/ef0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/gv0.rc b/projects/gv0.rc
index 7593751ff..a92f59451 100755
--- a/projects/gv0.rc
+++ b/projects/gv0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/gv0.vcproj b/projects/gv0.vcproj
index 005fcbfbe..fd879ad59 100755
--- a/projects/gv0.vcproj
+++ b/projects/gv0.vcproj
@@ -107,7 +107,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -238,7 +238,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/in0.rc b/projects/in0.rc
index 7593751ff..a92f59451 100755
--- a/projects/in0.rc
+++ b/projects/in0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/li0.rc b/projects/li0.rc
index 7593751ff..a92f59451 100755
--- a/projects/li0.rc
+++ b/projects/li0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/li0.vcproj b/projects/li0.vcproj
index 502bbea29..580e9d6fb 100755
--- a/projects/li0.vcproj
+++ b/projects/li0.vcproj
@@ -107,7 +107,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -240,7 +240,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/lv0.rc b/projects/lv0.rc
index 7593751ff..a92f59451 100755
--- a/projects/lv0.rc
+++ b/projects/lv0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/lv0.vcproj b/projects/lv0.vcproj
index b19fd3066..6bf78dbd9 100755
--- a/projects/lv0.vcproj
+++ b/projects/lv0.vcproj
@@ -122,7 +122,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -268,7 +268,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/lv2.rc b/projects/lv2.rc
index 7593751ff..a92f59451 100755
--- a/projects/lv2.rc
+++ b/projects/lv2.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/lv2.vcproj b/projects/lv2.vcproj
index bee1782e0..f7e7bb804 100755
--- a/projects/lv2.vcproj
+++ b/projects/lv2.vcproj
@@ -118,7 +118,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -261,7 +261,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/lv3.rc b/projects/lv3.rc
index 7593751ff..a92f59451 100755
--- a/projects/lv3.rc
+++ b/projects/lv3.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/lv3.vcproj b/projects/lv3.vcproj
index 9277b41c0..f5dfe41e5 100755
--- a/projects/lv3.vcproj
+++ b/projects/lv3.vcproj
@@ -116,7 +116,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -256,7 +256,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/mg0.rc b/projects/mg0.rc
index 7593751ff..a92f59451 100755
--- a/projects/mg0.rc
+++ b/projects/mg0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/mg0.vcproj b/projects/mg0.vcproj
index 61aecf73c..b79ec0ce8 100755
--- a/projects/mg0.vcproj
+++ b/projects/mg0.vcproj
@@ -119,7 +119,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -263,7 +263,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/mg1.rc b/projects/mg1.rc
index 7593751ff..a92f59451 100755
--- a/projects/mg1.rc
+++ b/projects/mg1.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/mg1.vcproj b/projects/mg1.vcproj
index d5d18326a..337a3ed61 100755
--- a/projects/mg1.vcproj
+++ b/projects/mg1.vcproj
@@ -107,7 +107,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -238,7 +238,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/mg3.rc b/projects/mg3.rc
index 7593751ff..a92f59451 100755
--- a/projects/mg3.rc
+++ b/projects/mg3.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/mg3.vcproj b/projects/mg3.vcproj
index 885419eda..c01989cd1 100755
--- a/projects/mg3.vcproj
+++ b/projects/mg3.vcproj
@@ -121,7 +121,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -267,7 +267,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/mg4.rc b/projects/mg4.rc
index 7593751ff..a92f59451 100755
--- a/projects/mg4.rc
+++ b/projects/mg4.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/mg4.vcproj b/projects/mg4.vcproj
index 1554d96eb..756e9fd7c 100755
--- a/projects/mg4.vcproj
+++ b/projects/mg4.vcproj
@@ -107,7 +107,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -238,7 +238,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/mr0.rc b/projects/mr0.rc
index 7593751ff..a92f59451 100755
--- a/projects/mr0.rc
+++ b/projects/mr0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/mr0.vcproj b/projects/mr0.vcproj
index 0b858e908..ad9bef598 100755
--- a/projects/mr0.vcproj
+++ b/projects/mr0.vcproj
@@ -107,7 +107,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -239,7 +239,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/mr1.rc b/projects/mr1.rc
index 7593751ff..a92f59451 100755
--- a/projects/mr1.rc
+++ b/projects/mr1.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/mr1.vcproj b/projects/mr1.vcproj
index d6cbacd71..721df5abb 100755
--- a/projects/mr1.vcproj
+++ b/projects/mr1.vcproj
@@ -107,7 +107,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -238,7 +238,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/mr2.rc b/projects/mr2.rc
index 7593751ff..a92f59451 100755
--- a/projects/mr2.rc
+++ b/projects/mr2.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/mr2.vcproj b/projects/mr2.vcproj
index 36c1f04bd..5709a3eb6 100755
--- a/projects/mr2.vcproj
+++ b/projects/mr2.vcproj
@@ -107,7 +107,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -239,7 +239,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/omnia0.rc b/projects/omnia0.rc
index 7593751ff..a92f59451 100755
--- a/projects/omnia0.rc
+++ b/projects/omnia0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/or1.rc b/projects/or1.rc
index 7593751ff..a92f59451 100755
--- a/projects/or1.rc
+++ b/projects/or1.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/pd0001.rc b/projects/pd0001.rc
index 7593751ff..a92f59451 100755
--- a/projects/pd0001.rc
+++ b/projects/pd0001.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/pd0001.vcproj b/projects/pd0001.vcproj
index 80ef11117..9c0a23496 100755
--- a/projects/pd0001.vcproj
+++ b/projects/pd0001.vcproj
@@ -121,7 +121,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -268,7 +268,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/pd0350.rc b/projects/pd0350.rc
index 7593751ff..a92f59451 100755
--- a/projects/pd0350.rc
+++ b/projects/pd0350.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/pd0350.vcproj b/projects/pd0350.vcproj
index ffb3a96a2..6eb976ee2 100755
--- a/projects/pd0350.vcproj
+++ b/projects/pd0350.vcproj
@@ -67,7 +67,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/pd0666.rc b/projects/pd0666.rc
index 7593751ff..a92f59451 100755
--- a/projects/pd0666.rc
+++ b/projects/pd0666.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/pd0666.vcproj b/projects/pd0666.vcproj
index c95a88d76..d5fe2ef44 100755
--- a/projects/pd0666.vcproj
+++ b/projects/pd0666.vcproj
@@ -67,7 +67,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/pd0777.rc b/projects/pd0777.rc
index 7593751ff..a92f59451 100755
--- a/projects/pd0777.rc
+++ b/projects/pd0777.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/pd0777.vcproj b/projects/pd0777.vcproj
index ce7b09d25..dbfdfd412 100755
--- a/projects/pd0777.vcproj
+++ b/projects/pd0777.vcproj
@@ -67,7 +67,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/pd1579.rc b/projects/pd1579.rc
index 7593751ff..a92f59451 100755
--- a/projects/pd1579.rc
+++ b/projects/pd1579.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/pd1579.vcproj b/projects/pd1579.vcproj
index 803dd45eb..98a66b0ec 100755
--- a/projects/pd1579.vcproj
+++ b/projects/pd1579.vcproj
@@ -67,7 +67,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/pd1890.rc b/projects/pd1890.rc
index 7593751ff..a92f59451 100755
--- a/projects/pd1890.rc
+++ b/projects/pd1890.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/pd1890.vcproj b/projects/pd1890.vcproj
index 2ca522e27..6ae3defe0 100755
--- a/projects/pd1890.vcproj
+++ b/projects/pd1890.vcproj
@@ -67,7 +67,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/pd6030.rc b/projects/pd6030.rc
index 7593751ff..a92f59451 100755
--- a/projects/pd6030.rc
+++ b/projects/pd6030.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/pd6030.vcproj b/projects/pd6030.vcproj
index a05ee9e5f..0ee0eb746 100755
--- a/projects/pd6030.vcproj
+++ b/projects/pd6030.vcproj
@@ -67,7 +67,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/pd6142.rc b/projects/pd6142.rc
index 7593751ff..a92f59451 100755
--- a/projects/pd6142.rc
+++ b/projects/pd6142.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/pd6142.vcproj b/projects/pd6142.vcproj
index 4f026160f..4646af558 100755
--- a/projects/pd6142.vcproj
+++ b/projects/pd6142.vcproj
@@ -118,7 +118,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -262,7 +262,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/pdflibwrap.vcproj b/projects/pdflibwrap.vcproj
index 165cfef14..f5bad457f 100755
--- a/projects/pdflibwrap.vcproj
+++ b/projects/pdflibwrap.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\wx287\lib\vc_dll\mswd;..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\lib\vc_dll\mswd;..\..\wx289\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -105,7 +105,8 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\wx287\lib\vc_dll\msw;..\..\wx287\include"
+				WholeProgramOptimization="false"
+				AdditionalIncludeDirectories="..\..\wx289\lib\vc_dll\msw;..\..\wx289\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
diff --git a/projects/pg0001.rc b/projects/pg0001.rc
index 7593751ff..a92f59451 100755
--- a/projects/pg0001.rc
+++ b/projects/pg0001.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/pg0001.vcproj b/projects/pg0001.vcproj
index 1552152f7..b796c5a6a 100755
--- a/projects/pg0001.vcproj
+++ b/projects/pg0001.vcproj
@@ -67,7 +67,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -164,7 +164,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/pg0069.rc b/projects/pg0069.rc
index 7593751ff..a92f59451 100755
--- a/projects/pg0069.rc
+++ b/projects/pg0069.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/pg0069.vcproj b/projects/pg0069.vcproj
index 32b1c4d6a..9699c5c03 100755
--- a/projects/pg0069.vcproj
+++ b/projects/pg0069.vcproj
@@ -68,7 +68,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/pg0388.rc b/projects/pg0388.rc
index 7593751ff..a92f59451 100755
--- a/projects/pg0388.rc
+++ b/projects/pg0388.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/pg0388.vcproj b/projects/pg0388.vcproj
index 3b81e771a..37f204bfb 100755
--- a/projects/pg0388.vcproj
+++ b/projects/pg0388.vcproj
@@ -67,7 +67,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -164,7 +164,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/pr0.rc b/projects/pr0.rc
index 7593751ff..a92f59451 100755
--- a/projects/pr0.rc
+++ b/projects/pr0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/pr0.vcproj b/projects/pr0.vcproj
index 4622a69e7..a92f39d37 100755
--- a/projects/pr0.vcproj
+++ b/projects/pr0.vcproj
@@ -31,44 +31,59 @@
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="IniCompiler"
+				Name="DatCompiler"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
+			<Tool
+				Name="BmpCompiler"
+			/>
+			<Tool
+				Name="GifCompiler"
+			/>
+			<Tool
+				Name="DesCompiler"
+			/>
+			<Tool
+				Name="SrcDebugCompiler"
+			/>
+			<Tool
+				Name="MskCompiler"
+			/>
+			<Tool
+				Name="FormCompiler"
+			/>
+			<Tool
+				Name="AlxCompiler"
+			/>
+			<Tool
+				Name="TxtCompiler"
+			/>
+			<Tool
+				Name="PngCompiler"
+			/>
+			<Tool
+				Name="JpegCompiler"
+			/>
+			<Tool
+				Name="IniCompiler"
+			/>
 			<Tool
 				Name="MenCompiler"
 			/>
 			<Tool
 				Name="RepCompiler"
 			/>
-			<Tool
-				Name="FormCompiler"
-			/>
-			<Tool
-				Name="DesCompiler"
-			/>
-			<Tool
-				Name="GifCompiler"
-			/>
 			<Tool
 				Name="TrrCompiler"
 			/>
+			<Tool
+				Name="SrcReleaseCompiler"
+			/>
 			<Tool
 				Name="DirCompiler"
 			/>
-			<Tool
-				Name="MskCompiler"
-			/>
-			<Tool
-				Name="TxtCompiler"
-			/>
-			<Tool
-				Name="JpegCompiler"
-			/>
-			<Tool
-				Name="AlxCompiler"
-			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
 			/>
@@ -107,7 +122,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,44 +178,59 @@
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="IniCompiler"
+				Name="DatCompiler"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
+			<Tool
+				Name="BmpCompiler"
+			/>
+			<Tool
+				Name="GifCompiler"
+			/>
+			<Tool
+				Name="DesCompiler"
+			/>
+			<Tool
+				Name="SrcDebugCompiler"
+			/>
+			<Tool
+				Name="MskCompiler"
+			/>
+			<Tool
+				Name="FormCompiler"
+			/>
+			<Tool
+				Name="AlxCompiler"
+			/>
+			<Tool
+				Name="TxtCompiler"
+			/>
+			<Tool
+				Name="PngCompiler"
+			/>
+			<Tool
+				Name="JpegCompiler"
+			/>
+			<Tool
+				Name="IniCompiler"
+			/>
 			<Tool
 				Name="MenCompiler"
 			/>
 			<Tool
 				Name="RepCompiler"
 			/>
-			<Tool
-				Name="FormCompiler"
-			/>
-			<Tool
-				Name="DesCompiler"
-			/>
-			<Tool
-				Name="GifCompiler"
-			/>
 			<Tool
 				Name="TrrCompiler"
 			/>
+			<Tool
+				Name="SrcReleaseCompiler"
+			/>
 			<Tool
 				Name="DirCompiler"
 			/>
-			<Tool
-				Name="MskCompiler"
-			/>
-			<Tool
-				Name="TxtCompiler"
-			/>
-			<Tool
-				Name="JpegCompiler"
-			/>
-			<Tool
-				Name="AlxCompiler"
-			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
 			/>
@@ -239,7 +269,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -517,128 +547,38 @@
 			<File
 				RelativePath="..\pr\pr0500a.uml"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="MskCompiler"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="MskCompiler"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\pr\pr0600a.uml"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="MskCompiler"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="MskCompiler"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\pr\pr0700a.uml"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="MskCompiler"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="MskCompiler"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\pr\pr0700b.uml"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="MskCompiler"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="MskCompiler"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\pr\pr0800a.uml"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="MskCompiler"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="MskCompiler"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\pr\prstapr.uml"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="MskCompiler"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="MskCompiler"
-					/>
-				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\pr\prstsua.uml"
+				>
 			</File>
 			<File
 				RelativePath="..\pr\prtbapr.uml"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="MskCompiler"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="MskCompiler"
-					/>
-				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\pr\prtbsua.uml"
+				>
 			</File>
 		</Filter>
 		<Filter
@@ -669,6 +609,10 @@
 				RelativePath="..\pr\pr0800a.h"
 				>
 			</File>
+			<File
+				RelativePath="..\pr\prtbsua.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Trr"
@@ -677,56 +621,14 @@
 			<File
 				RelativePath="..\pr\f122.trr"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="TrrCompiler"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="TrrCompiler"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\pr\f123.trr"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="TrrCompiler"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="TrrCompiler"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\pr\f124.trr"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="TrrCompiler"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="TrrCompiler"
-					/>
-				</FileConfiguration>
 			</File>
 		</Filter>
 		<Filter
@@ -736,56 +638,14 @@
 			<File
 				RelativePath="..\pr\f122.dir"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="DirCompiler"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="DirCompiler"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\pr\f123.dir"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="DirCompiler"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="DirCompiler"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\pr\f124.dir"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="DirCompiler"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="DirCompiler"
-					/>
-				</FileConfiguration>
 			</File>
 		</Filter>
 		<Filter
@@ -795,20 +655,6 @@
 			<File
 				RelativePath="..\pr\prmenu.men"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="MenCompiler"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="MenCompiler"
-					/>
-				</FileConfiguration>
 			</File>
 		</Filter>
 		<Filter
@@ -818,20 +664,10 @@
 			<File
 				RelativePath="..\pr\prstapr.rep"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="RepCompiler"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="RepCompiler"
-					/>
-				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\pr\prstsua.rep"
+				>
 			</File>
 		</Filter>
 		<File
diff --git a/projects/pr1.rc b/projects/pr1.rc
index 7593751ff..a92f59451 100755
--- a/projects/pr1.rc
+++ b/projects/pr1.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/pr1.vcproj b/projects/pr1.vcproj
index 89845367e..42e7d413b 100755
--- a/projects/pr1.vcproj
+++ b/projects/pr1.vcproj
@@ -119,7 +119,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -262,7 +262,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ps0017.rc b/projects/ps0017.rc
index 7593751ff..a92f59451 100755
--- a/projects/ps0017.rc
+++ b/projects/ps0017.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/ps0017.vcproj b/projects/ps0017.vcproj
index 463efe529..e853ac924 100755
--- a/projects/ps0017.vcproj
+++ b/projects/ps0017.vcproj
@@ -67,7 +67,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ps0077.rc b/projects/ps0077.rc
index 7593751ff..a92f59451 100755
--- a/projects/ps0077.rc
+++ b/projects/ps0077.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/ps0077.vcproj b/projects/ps0077.vcproj
index 4945fd23c..c8e111f05 100755
--- a/projects/ps0077.vcproj
+++ b/projects/ps0077.vcproj
@@ -122,7 +122,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -269,7 +269,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ps0099.rc b/projects/ps0099.rc
index 7593751ff..a92f59451 100755
--- a/projects/ps0099.rc
+++ b/projects/ps0099.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/ps0099.vcproj b/projects/ps0099.vcproj
index db72e88b1..6e7941c32 100755
--- a/projects/ps0099.vcproj
+++ b/projects/ps0099.vcproj
@@ -118,7 +118,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -261,7 +261,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ps0430.rc b/projects/ps0430.rc
index 7593751ff..a92f59451 100755
--- a/projects/ps0430.rc
+++ b/projects/ps0430.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/ps0430.vcproj b/projects/ps0430.vcproj
index 8c5c999f0..397314181 100755
--- a/projects/ps0430.vcproj
+++ b/projects/ps0430.vcproj
@@ -67,7 +67,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ps0544.rc b/projects/ps0544.rc
index 7593751ff..a92f59451 100755
--- a/projects/ps0544.rc
+++ b/projects/ps0544.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/ps0544.vcproj b/projects/ps0544.vcproj
index 64e37ac2c..418848ecc 100755
--- a/projects/ps0544.vcproj
+++ b/projects/ps0544.vcproj
@@ -67,7 +67,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ps0713.rc b/projects/ps0713.rc
index 7593751ff..a92f59451 100755
--- a/projects/ps0713.rc
+++ b/projects/ps0713.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/ps0713.vcproj b/projects/ps0713.vcproj
index 7015d5a40..0c82effcc 100755
--- a/projects/ps0713.vcproj
+++ b/projects/ps0713.vcproj
@@ -67,7 +67,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ps0816.rc b/projects/ps0816.rc
index 7593751ff..a92f59451 100755
--- a/projects/ps0816.rc
+++ b/projects/ps0816.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/ps0816.vcproj b/projects/ps0816.vcproj
index 3a6dc3956..3eaacbc09 100755
--- a/projects/ps0816.vcproj
+++ b/projects/ps0816.vcproj
@@ -67,7 +67,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ps0872.rc b/projects/ps0872.rc
index 7593751ff..a92f59451 100755
--- a/projects/ps0872.rc
+++ b/projects/ps0872.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/ps0872.vcproj b/projects/ps0872.vcproj
index caf00263f..a14ca48ec 100755
--- a/projects/ps0872.vcproj
+++ b/projects/ps0872.vcproj
@@ -67,7 +67,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ps0913 .vcproj b/projects/ps0913 .vcproj
index 1ad68478b..13c9875a2 100755
--- a/projects/ps0913 .vcproj	
+++ b/projects/ps0913 .vcproj	
@@ -67,7 +67,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ps0913.rc b/projects/ps0913.rc
index 7593751ff..a92f59451 100755
--- a/projects/ps0913.rc
+++ b/projects/ps0913.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/ps0920.rc b/projects/ps0920.rc
index 7593751ff..a92f59451 100755
--- a/projects/ps0920.rc
+++ b/projects/ps0920.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/ps0920.vcproj b/projects/ps0920.vcproj
index bfa662697..5210e40f3 100755
--- a/projects/ps0920.vcproj
+++ b/projects/ps0920.vcproj
@@ -67,7 +67,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ps1100.rc b/projects/ps1100.rc
index 7593751ff..a92f59451 100755
--- a/projects/ps1100.rc
+++ b/projects/ps1100.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/ps1100.vcproj b/projects/ps1100.vcproj
index cd083a1cc..4f5b8648b 100755
--- a/projects/ps1100.vcproj
+++ b/projects/ps1100.vcproj
@@ -67,7 +67,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ps1104.rc b/projects/ps1104.rc
index 7593751ff..a92f59451 100755
--- a/projects/ps1104.rc
+++ b/projects/ps1104.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/ps1104.vcproj b/projects/ps1104.vcproj
index dde2177d4..efb5f6d87 100755
--- a/projects/ps1104.vcproj
+++ b/projects/ps1104.vcproj
@@ -67,7 +67,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/pt0001.rc b/projects/pt0001.rc
index 7593751ff..a92f59451 100755
--- a/projects/pt0001.rc
+++ b/projects/pt0001.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/pt0001.vcproj b/projects/pt0001.vcproj
index b90fe747a..fcd14640b 100755
--- a/projects/pt0001.vcproj
+++ b/projects/pt0001.vcproj
@@ -68,7 +68,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/pt0195.rc b/projects/pt0195.rc
index 7593751ff..a92f59451 100755
--- a/projects/pt0195.rc
+++ b/projects/pt0195.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/pt0195.vcproj b/projects/pt0195.vcproj
index 01800588f..78e005f6d 100755
--- a/projects/pt0195.vcproj
+++ b/projects/pt0195.vcproj
@@ -67,7 +67,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -164,7 +164,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/sc0.rc b/projects/sc0.rc
index 7593751ff..a92f59451 100755
--- a/projects/sc0.rc
+++ b/projects/sc0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/sc1.rc b/projects/sc1.rc
index 7593751ff..a92f59451 100755
--- a/projects/sc1.rc
+++ b/projects/sc1.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/sc2.rc b/projects/sc2.rc
index 7593751ff..a92f59451 100755
--- a/projects/sc2.rc
+++ b/projects/sc2.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/sc3.rc b/projects/sc3.rc
index 7593751ff..a92f59451 100755
--- a/projects/sc3.rc
+++ b/projects/sc3.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/si0.rc b/projects/si0.rc
index 7593751ff..a92f59451 100755
--- a/projects/si0.rc
+++ b/projects/si0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/sv0.rc b/projects/sv0.rc
index 7593751ff..a92f59451 100755
--- a/projects/sv0.rc
+++ b/projects/sv0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/sv0.vcproj b/projects/sv0.vcproj
index 4b7de2691..0ed7b4337 100755
--- a/projects/sv0.vcproj
+++ b/projects/sv0.vcproj
@@ -107,7 +107,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -239,7 +239,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/sv1.rc b/projects/sv1.rc
index 7593751ff..a92f59451 100755
--- a/projects/sv1.rc
+++ b/projects/sv1.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/sv1.vcproj b/projects/sv1.vcproj
index f7723fe09..aef462a64 100755
--- a/projects/sv1.vcproj
+++ b/projects/sv1.vcproj
@@ -107,7 +107,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -240,7 +240,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/sv2.rc b/projects/sv2.rc
index 7593751ff..a92f59451 100755
--- a/projects/sv2.rc
+++ b/projects/sv2.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/sv2.vcproj b/projects/sv2.vcproj
index 5df2d9949..1b7045084 100755
--- a/projects/sv2.vcproj
+++ b/projects/sv2.vcproj
@@ -107,7 +107,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -238,7 +238,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/tc0.rc b/projects/tc0.rc
index 7593751ff..a92f59451 100755
--- a/projects/tc0.rc
+++ b/projects/tc0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/tc0.vcproj b/projects/tc0.vcproj
index 0651401e4..dcc1899e1 100755
--- a/projects/tc0.vcproj
+++ b/projects/tc0.vcproj
@@ -107,7 +107,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -239,7 +239,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/tc1.rc b/projects/tc1.rc
index 7593751ff..a92f59451 100755
--- a/projects/tc1.rc
+++ b/projects/tc1.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/tc1.vcproj b/projects/tc1.vcproj
index a9ee6d2e4..286460868 100755
--- a/projects/tc1.vcproj
+++ b/projects/tc1.vcproj
@@ -107,7 +107,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -238,7 +238,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/tc8.rc b/projects/tc8.rc
index 7593751ff..a92f59451 100755
--- a/projects/tc8.rc
+++ b/projects/tc8.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/tc8.vcproj b/projects/tc8.vcproj
index 8a2b7a364..89d2b016f 100755
--- a/projects/tc8.vcproj
+++ b/projects/tc8.vcproj
@@ -107,7 +107,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -239,7 +239,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/tc9.rc b/projects/tc9.rc
index 7593751ff..a92f59451 100755
--- a/projects/tc9.rc
+++ b/projects/tc9.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/tc9.vcproj b/projects/tc9.vcproj
index 308dc9023..1504b5ca4 100755
--- a/projects/tc9.vcproj
+++ b/projects/tc9.vcproj
@@ -119,7 +119,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -262,7 +262,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/tp0.rc b/projects/tp0.rc
index 7593751ff..a92f59451 100755
--- a/projects/tp0.rc
+++ b/projects/tp0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/tp0.vcproj b/projects/tp0.vcproj
index e01d79ef5..3ec7b9af9 100755
--- a/projects/tp0.vcproj
+++ b/projects/tp0.vcproj
@@ -119,7 +119,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -263,7 +263,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/update.vcproj b/projects/update.vcproj
index dd822d9d4..5ece28c1e 100755
--- a/projects/update.vcproj
+++ b/projects/update.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\wx287\lib\vc_lib\mswd;..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\lib\vc_lib\mswd;..\..\wx289\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -57,7 +57,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -122,7 +122,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\..\wx287\lib\vc_lib\msw;..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\lib\vc_lib\msw;..\..\wx289\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				BasicRuntimeChecks="0"
 				RuntimeLibrary="0"
@@ -140,7 +140,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -223,7 +223,7 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_lib\wxbase28.lib"
+			RelativePath="..\..\wx289\lib\vc_lib\wxbase28.lib"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -235,7 +235,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_lib\wxbase28_net.lib"
+			RelativePath="..\..\wx289\lib\vc_lib\wxbase28_net.lib"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -247,7 +247,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_lib\wxbase28d.lib"
+			RelativePath="..\..\wx289\lib\vc_lib\wxbase28d.lib"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -259,7 +259,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_lib\wxbase28d_net.lib"
+			RelativePath="..\..\wx289\lib\vc_lib\wxbase28d_net.lib"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -271,7 +271,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_lib\wxexpat.lib"
+			RelativePath="..\..\wx289\lib\vc_lib\wxexpat.lib"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -283,7 +283,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_lib\wxexpatd.lib"
+			RelativePath="..\..\wx289\lib\vc_lib\wxexpatd.lib"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -295,7 +295,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_lib\wxjpeg.lib"
+			RelativePath="..\..\wx289\lib\vc_lib\wxjpeg.lib"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -307,7 +307,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_lib\wxjpegd.lib"
+			RelativePath="..\..\wx289\lib\vc_lib\wxjpegd.lib"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -319,7 +319,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_lib\wxmsw28_adv.lib"
+			RelativePath="..\..\wx289\lib\vc_lib\wxmsw28_adv.lib"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -331,7 +331,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_lib\wxmsw28_aui.lib"
+			RelativePath="..\..\wx289\lib\vc_lib\wxmsw28_aui.lib"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -343,7 +343,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_lib\wxmsw28_core.lib"
+			RelativePath="..\..\wx289\lib\vc_lib\wxmsw28_core.lib"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -355,7 +355,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_lib\wxmsw28_html.lib"
+			RelativePath="..\..\wx289\lib\vc_lib\wxmsw28_html.lib"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -367,7 +367,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_lib\wxmsw28d_adv.lib"
+			RelativePath="..\..\wx289\lib\vc_lib\wxmsw28d_adv.lib"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -379,7 +379,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_lib\wxmsw28d_aui.lib"
+			RelativePath="..\..\wx289\lib\vc_lib\wxmsw28d_aui.lib"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -391,7 +391,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_lib\wxmsw28d_core.lib"
+			RelativePath="..\..\wx289\lib\vc_lib\wxmsw28d_core.lib"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -403,7 +403,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_lib\wxmsw28d_html.lib"
+			RelativePath="..\..\wx289\lib\vc_lib\wxmsw28d_html.lib"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -415,7 +415,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_lib\wxpng.lib"
+			RelativePath="..\..\wx289\lib\vc_lib\wxpng.lib"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -427,7 +427,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_lib\wxpngd.lib"
+			RelativePath="..\..\wx289\lib\vc_lib\wxpngd.lib"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -439,7 +439,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_lib\wxtiff.lib"
+			RelativePath="..\..\wx289\lib\vc_lib\wxtiff.lib"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -451,7 +451,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_lib\wxtiffd.lib"
+			RelativePath="..\..\wx289\lib\vc_lib\wxtiffd.lib"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -463,7 +463,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_lib\wxzlib.lib"
+			RelativePath="..\..\wx289\lib\vc_lib\wxzlib.lib"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -475,7 +475,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_lib\wxzlibd.lib"
+			RelativePath="..\..\wx289\lib\vc_lib\wxzlibd.lib"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
diff --git a/projects/vd0.rc b/projects/vd0.rc
index 7593751ff..a92f59451 100755
--- a/projects/vd0.rc
+++ b/projects/vd0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/vd0.vcproj b/projects/vd0.vcproj
index fd9845b34..a77211d10 100755
--- a/projects/vd0.vcproj
+++ b/projects/vd0.vcproj
@@ -118,7 +118,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -261,7 +261,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/vd1.rc b/projects/vd1.rc
index 7593751ff..a92f59451 100755
--- a/projects/vd1.rc
+++ b/projects/vd1.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/vd1.vcproj b/projects/vd1.vcproj
index 824143864..77b31605a 100755
--- a/projects/vd1.vcproj
+++ b/projects/vd1.vcproj
@@ -115,7 +115,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -256,7 +256,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ve0.rc b/projects/ve0.rc
index 7593751ff..a92f59451 100755
--- a/projects/ve0.rc
+++ b/projects/ve0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/ve0.vcproj b/projects/ve0.vcproj
index 03f41084c..ce890c0a5 100755
--- a/projects/ve0.vcproj
+++ b/projects/ve0.vcproj
@@ -122,7 +122,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -262,6 +262,7 @@
 				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -270,7 +271,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -282,6 +283,7 @@
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames="libc.lib"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\..\release/ve0.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
diff --git a/projects/ve1.rc b/projects/ve1.rc
index 7593751ff..a92f59451 100755
--- a/projects/ve1.rc
+++ b/projects/ve1.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/ve1.vcproj b/projects/ve1.vcproj
index 950ca2d04..d8b310f3a 100755
--- a/projects/ve1.vcproj
+++ b/projects/ve1.vcproj
@@ -119,7 +119,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -262,7 +262,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ve2.rc b/projects/ve2.rc
index 7593751ff..a92f59451 100755
--- a/projects/ve2.rc
+++ b/projects/ve2.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/ve2.vcproj b/projects/ve2.vcproj
index 2a70f64b5..dc7b6e220 100755
--- a/projects/ve2.vcproj
+++ b/projects/ve2.vcproj
@@ -116,7 +116,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -257,7 +257,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ve3.rc b/projects/ve3.rc
index 7593751ff..a92f59451 100755
--- a/projects/ve3.rc
+++ b/projects/ve3.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/ve3.vcproj b/projects/ve3.vcproj
index 97f76daaa..e6bd866c5 100755
--- a/projects/ve3.vcproj
+++ b/projects/ve3.vcproj
@@ -116,7 +116,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -257,7 +257,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ve4.rc b/projects/ve4.rc
index 7593751ff..a92f59451 100755
--- a/projects/ve4.rc
+++ b/projects/ve4.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/ve4.vcproj b/projects/ve4.vcproj
index 7aad5c39d..aa0f1f413 100755
--- a/projects/ve4.vcproj
+++ b/projects/ve4.vcproj
@@ -116,7 +116,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -257,7 +257,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ve5.rc b/projects/ve5.rc
index 7593751ff..a92f59451 100755
--- a/projects/ve5.rc
+++ b/projects/ve5.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/ve5.vcproj b/projects/ve5.vcproj
index 5a98b89a5..834bae6b4 100755
--- a/projects/ve5.vcproj
+++ b/projects/ve5.vcproj
@@ -92,7 +92,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -208,7 +208,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ve6.rc b/projects/ve6.rc
index 7593751ff..a92f59451 100755
--- a/projects/ve6.rc
+++ b/projects/ve6.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/ve6.vcproj b/projects/ve6.vcproj
index 480b8b144..927fa10ce 100755
--- a/projects/ve6.vcproj
+++ b/projects/ve6.vcproj
@@ -116,7 +116,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -257,7 +257,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ve8.rc b/projects/ve8.rc
index 7593751ff..a92f59451 100755
--- a/projects/ve8.rc
+++ b/projects/ve8.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx287/include/wx/msw/wx.rc
+rcinclude ../../wx289/include/wx/msw/wx.rc
 
diff --git a/projects/ve8.vcproj b/projects/ve8.vcproj
index f6e53cf60..549941f44 100755
--- a/projects/ve8.vcproj
+++ b/projects/ve8.vcproj
@@ -116,7 +116,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -257,7 +257,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/xvaga.vcproj b/projects/xvaga.vcproj
index 1a649e8b3..53aec2f0a 100755
--- a/projects/xvaga.vcproj
+++ b/projects/xvaga.vcproj
@@ -49,7 +49,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="4"
-				AdditionalIncludeDirectories="..\..\wx287\lib\vc_dll\msw;..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\lib\vc_dll\msw;..\..\wx289\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;XVAGADLL"
 				RuntimeLibrary="0"
 				PrecompiledHeaderFile=".\..\Release\Xvaga/xvaga.pch"
@@ -141,7 +141,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\wx287\lib\vc_dll\mswd;..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\lib\vc_dll\mswd;..\..\wx289\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;XVAGADLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -491,7 +491,7 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_dll\wxbase28.lib"
+			RelativePath="..\..\wx289\lib\vc_dll\wxbase28.lib"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -503,7 +503,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_dll\wxbase28_odbc.lib"
+			RelativePath="..\..\wx289\lib\vc_dll\wxbase28_odbc.lib"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -515,7 +515,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_dll\wxbase28d.lib"
+			RelativePath="..\..\wx289\lib\vc_dll\wxbase28d.lib"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -527,7 +527,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_dll\wxbase28d_odbc.lib"
+			RelativePath="..\..\wx289\lib\vc_dll\wxbase28d_odbc.lib"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -539,7 +539,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_dll\wxmsw28_adv.lib"
+			RelativePath="..\..\wx289\lib\vc_dll\wxmsw28_adv.lib"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -551,7 +551,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_dll\wxmsw28_aui.lib"
+			RelativePath="..\..\wx289\lib\vc_dll\wxmsw28_aui.lib"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -563,7 +563,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_dll\wxmsw28_core.lib"
+			RelativePath="..\..\wx289\lib\vc_dll\wxmsw28_core.lib"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -575,7 +575,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_dll\wxmsw28d_adv.lib"
+			RelativePath="..\..\wx289\lib\vc_dll\wxmsw28d_adv.lib"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -587,7 +587,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_dll\wxmsw28d_aui.lib"
+			RelativePath="..\..\wx289\lib\vc_dll\wxmsw28d_aui.lib"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -599,7 +599,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_dll\wxmsw28d_core.lib"
+			RelativePath="..\..\wx289\lib\vc_dll\wxmsw28d_core.lib"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
diff --git a/projects/xvapp.vcproj b/projects/xvapp.vcproj
index a61ebcf86..0218f943e 100755
--- a/projects/xvapp.vcproj
+++ b/projects/xvapp.vcproj
@@ -42,7 +42,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\wx287\lib\vc_dll\mswd,..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\lib\vc_dll\mswd,..\..\wx289\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -119,7 +119,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\wx287\lib\vc_dll\msw,..\..\wx287\include"
+				AdditionalIncludeDirectories="..\..\wx289\lib\vc_dll\msw,..\..\wx289\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -202,7 +202,7 @@
 			>
 		</Filter>
 		<File
-			RelativePath="..\..\wx287\lib\vc_dll\wxbase28.lib"
+			RelativePath="..\..\wx289\lib\vc_dll\wxbase28.lib"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -214,7 +214,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_dll\wxbase28_odbc.lib"
+			RelativePath="..\..\wx289\lib\vc_dll\wxbase28_odbc.lib"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -226,7 +226,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_dll\wxbase28d.lib"
+			RelativePath="..\..\wx289\lib\vc_dll\wxbase28d.lib"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -238,7 +238,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_dll\wxbase28d_odbc.lib"
+			RelativePath="..\..\wx289\lib\vc_dll\wxbase28d_odbc.lib"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -250,7 +250,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_dll\wxmsw28_adv.lib"
+			RelativePath="..\..\wx289\lib\vc_dll\wxmsw28_adv.lib"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -262,7 +262,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_dll\wxmsw28_core.lib"
+			RelativePath="..\..\wx289\lib\vc_dll\wxmsw28_core.lib"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -274,7 +274,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_dll\wxmsw28d_adv.lib"
+			RelativePath="..\..\wx289\lib\vc_dll\wxmsw28d_adv.lib"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -286,7 +286,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx287\lib\vc_dll\wxmsw28d_core.lib"
+			RelativePath="..\..\wx289\lib\vc_dll\wxmsw28d_core.lib"
 			>
 			<FileConfiguration
 				Name="Release|Win32"