From e559c9ae33cfe5f6bcbebfc4babff7c6ea515cd9 Mon Sep 17 00:00:00 2001
From: luca <luca@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Mon, 26 Mar 2007 10:42:05 +0000
Subject: [PATCH] Patch level         : Files correlati     : Ricompilazione
 Demo : [ ] Commento            :

git-svn-id: svn://10.65.10.50/trunk@15120 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 projects/770.rc            |  2 +-
 projects/770.vcproj        |  4 +--
 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   | 44 ++++++++++++++++-----------------
 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/Cgp0.vcproj       |  4 +--
 projects/Cgp1.vcproj       |  4 +--
 projects/Cgp2.vcproj       |  4 +--
 projects/Cgp3.vcproj       |  4 +--
 projects/Database.vcproj   | 42 ++++++++++++++++----------------
 projects/Diction.vcproj    | 40 +++++++++++++++---------------
 projects/Ef0.vcproj        |  4 +--
 projects/In0.vcproj        |  4 +--
 projects/InstallShield.dsp |  2 +-
 projects/Lerch.vcproj      | 50 +++++++++++++++++++-------------------
 projects/Or1.vcproj        |  4 +--
 projects/Sc0.vcproj        |  4 +--
 projects/Sc1.vcproj        |  6 ++---
 projects/Sc2.vcproj        |  4 +--
 projects/Sc3.vcproj        |  6 ++---
 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/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/cg.sln            | 15 ------------
 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/cgp0.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/coffee.vcproj     | 44 ++++++++++++++++-----------------
 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/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/pd1579.rc         |  2 +-
 projects/pd1890.rc         |  2 +-
 projects/pd6030.rc         |  2 +-
 projects/pg0069.rc         |  2 +-
 projects/pg0388.rc         |  2 +-
 projects/pr0.rc            |  2 +-
 projects/pr0.vcproj        |  4 +--
 projects/pr1.rc            |  2 +-
 projects/pr1.vcproj        |  4 +--
 projects/ps0544.rc         |  2 +-
 projects/ps0816.rc         |  2 +-
 projects/ps0872.rc         |  2 +-
 projects/ps0913.rc         |  2 +-
 projects/ps0920.rc         |  2 +-
 projects/pt0195.rc         |  2 +-
 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/tc9.rc            |  2 +-
 projects/tc9.vcproj        |  4 +--
 projects/tp0.rc            |  2 +-
 projects/tp0.vcproj        |  4 +--
 projects/vd0.rc            |  2 +-
 projects/vd0.vcproj        |  4 +--
 projects/vd1.rc            |  2 +-
 projects/vd1.vcproj        |  4 +--
 projects/ve0.rc            |  2 +-
 projects/ve0.vcproj        |  4 +--
 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/ve7.rc            |  2 +-
 projects/ve7.vcproj        |  4 +--
 projects/ve8.rc            |  2 +-
 projects/ve8.vcproj        |  4 +--
 projects/vesirio.rc        |  2 +-
 projects/vesirio.vcproj    |  4 +--
 projects/xvaga.vcproj      | 20 +++++++--------
 projects/xvapp.vcproj      | 20 +++++++--------
 210 files changed, 434 insertions(+), 449 deletions(-)

diff --git a/projects/770.rc b/projects/770.rc
index 7e931c0f4..f03108047 100755
--- a/projects/770.rc
+++ b/projects/770.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/770.vcproj b/projects/770.vcproj
index 5020ce943..de7661555 100755
--- a/projects/770.vcproj
+++ b/projects/770.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/771mod.rc b/projects/771mod.rc
index 7e931c0f4..f03108047 100755
--- a/projects/771mod.rc
+++ b/projects/771mod.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/771mod.vcproj b/projects/771mod.vcproj
index 5c9fff9d6..b7d569bcc 100755
--- a/projects/771mod.vcproj
+++ b/projects/771mod.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/772mod.rc b/projects/772mod.rc
index 7e931c0f4..f03108047 100755
--- a/projects/772mod.rc
+++ b/projects/772mod.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/772mod.vcproj b/projects/772mod.vcproj
index edd20f75e..49b9fd4ec 100755
--- a/projects/772mod.vcproj
+++ b/projects/772mod.vcproj
@@ -67,7 +67,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/773mod.rc b/projects/773mod.rc
index 7e931c0f4..f03108047 100755
--- a/projects/773mod.rc
+++ b/projects/773mod.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/773mod.vcproj b/projects/773mod.vcproj
index e35a5d37d..c0f1a2e8f 100755
--- a/projects/773mod.vcproj
+++ b/projects/773mod.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/774.rc b/projects/774.rc
index 7e931c0f4..f03108047 100755
--- a/projects/774.rc
+++ b/projects/774.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/774.vcproj b/projects/774.vcproj
index 8d55eab57..489442d4f 100755
--- a/projects/774.vcproj
+++ b/projects/774.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/775.rc b/projects/775.rc
index 7e931c0f4..f03108047 100755
--- a/projects/775.rc
+++ b/projects/775.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/775.vcproj b/projects/775.vcproj
index df23fe225..52744a4f2 100755
--- a/projects/775.vcproj
+++ b/projects/775.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/776mod.rc b/projects/776mod.rc
index 7e931c0f4..f03108047 100755
--- a/projects/776mod.rc
+++ b/projects/776mod.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/776mod.vcproj b/projects/776mod.vcproj
index 232d8a22f..3893bbdc9 100755
--- a/projects/776mod.vcproj
+++ b/projects/776mod.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/777.rc b/projects/777.rc
index 7e931c0f4..f03108047 100755
--- a/projects/777.rc
+++ b/projects/777.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/777.vcproj b/projects/777.vcproj
index 794b2d0c7..fd19aec50 100755
--- a/projects/777.vcproj
+++ b/projects/777.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/77cnv.rc b/projects/77cnv.rc
index 7e931c0f4..f03108047 100755
--- a/projects/77cnv.rc
+++ b/projects/77cnv.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/77cnv.vcproj b/projects/77cnv.vcproj
index 9fd53a18d..7b3d34df5 100755
--- a/projects/77cnv.vcproj
+++ b/projects/77cnv.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Authoriz.vcproj b/projects/Authoriz.vcproj
index 4218b7e0b..df7ccd135 100755
--- a/projects/Authoriz.vcproj
+++ b/projects/Authoriz.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="2057"
-				AdditionalIncludeDirectories="\U\Luca\r020200\server;..\..\wx280\include"
+				AdditionalIncludeDirectories="\U\Luca\r020200\server;..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -143,7 +143,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\wx280\lib\vc_dll\mswd,..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\lib\vc_dll\mswd,..\..\wx283\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;__WINDOWS__;__WXMSW__;DEBUG=1;__WXDEBUG__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT;WXUSINGDLL=1"
 				MinimalRebuild="true"
 				RuntimeLibrary="3"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="2057"
-				AdditionalIncludeDirectories="..\server;..\..\wx280\include"
+				AdditionalIncludeDirectories="..\server;..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -174,7 +174,7 @@
 				OutputFile="../exed/servers/Authoriz.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\wx280\lib"
+				AdditionalLibraryDirectories="..\..\wx283\lib"
 				IgnoreDefaultLibraryNames="libcd.lib,libcid.lib"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\..\Debug\DebugServers/Authoriz.pdb"
@@ -241,7 +241,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="\wx280\include"
+				AdditionalIncludeDirectories="\wx283\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;__WINDOWS__;__WXMSW__;DEBUG=1;__WXDEBUG__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT"
 				MinimalRebuild="true"
 				RuntimeLibrary="1"
@@ -261,14 +261,14 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="2057"
-				AdditionalIncludeDirectories="\U\Luca\r020200\server;..\..\wx280\include"
+				AdditionalIncludeDirectories="\U\Luca\r020200\server;..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/libpath:&quot;/wx280/lib&quot;"
+				AdditionalOptions="/libpath:&quot;/wx283/lib&quot;"
 				AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib"
 				OutputFile="../exed/servers/Authoriz.exe"
 				LinkIncremental="2"
@@ -339,7 +339,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="4"
-				AdditionalIncludeDirectories="..\..\wx280\lib\vc_dll\msw,..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\lib\vc_dll\msw,..\..\wx283\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;__WINDOWS__;__WXMSW__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT;WXUSINGDLL=1"
 				RuntimeLibrary="2"
 				PrecompiledHeaderFile=".\..\Release\ReleaseDLLServers/Authoriz.pch"
@@ -356,7 +356,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="2057"
-				AdditionalIncludeDirectories="..\server;..\..\wx280\include"
+				AdditionalIncludeDirectories="..\server;..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -367,7 +367,7 @@
 				OutputFile="D:\Release\Campo40/servers/Authoriz.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\wx280\lib"
+				AdditionalLibraryDirectories="..\..\wx283\lib"
 				IgnoreDefaultLibraryNames="libc.lib,libci.lib"
 				ProgramDatabaseFile=".\..\Release\ReleaseDLLServers/Authoriz.pdb"
 				SubSystem="2"
@@ -621,7 +621,7 @@
 					Name="VCResourceCompilerTool"
 					PreprocessorDefinitions=""
 					Culture="1040"
-					AdditionalIncludeDirectories="\U\Luca\R_04_00\server;\U\Release\A_04_00\server;\U\Release\A_02_02\server;\U\Luca\A_02_02\server;\U\Luca\R_02_01\server;\U\Luca\r030200\server;\U\Luca\r020200.aga\server;\U\Luca\wx280\include;$(NoInherit)"
+					AdditionalIncludeDirectories="\U\Luca\R_04_00\server;\U\Release\A_04_00\server;\U\Release\A_02_02\server;\U\Luca\A_02_02\server;\U\Luca\R_02_01\server;\U\Luca\r030200\server;\U\Luca\r020200.aga\server;\U\Luca\wx283\include;$(NoInherit)"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -640,7 +640,7 @@
 					Name="VCResourceCompilerTool"
 					PreprocessorDefinitions=""
 					Culture="1040"
-					AdditionalIncludeDirectories="\U\Luca\R_04_00\server;\U\Release\A_04_00\server;\U\Release\A_02_02\server;\U\Luca\A_02_02\server;\U\Luca\R_02_01\server;\U\Luca\r030200\server;\U\Luca\r020200.aga\server;\U\Luca\wx280\include;$(NoInherit)"
+					AdditionalIncludeDirectories="\U\Luca\R_04_00\server;\U\Release\A_04_00\server;\U\Release\A_02_02\server;\U\Luca\A_02_02\server;\U\Luca\R_02_01\server;\U\Luca\r030200\server;\U\Luca\r020200.aga\server;\U\Luca\wx283\include;$(NoInherit)"
 				/>
 			</FileConfiguration>
 		</File>
@@ -649,7 +649,7 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxbase28.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxbase28.lib"
 			>
 			<FileConfiguration
 				Name="Debug DLL|Win32"
@@ -661,7 +661,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxbase28_net.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxbase28_net.lib"
 			>
 			<FileConfiguration
 				Name="Debug DLL|Win32"
@@ -673,7 +673,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxbase28_odbc.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxbase28_odbc.lib"
 			>
 			<FileConfiguration
 				Name="Debug DLL|Win32"
@@ -685,7 +685,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxbase28d.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxbase28d.lib"
 			>
 			<FileConfiguration
 				Name="Release DLL|Win32"
@@ -697,7 +697,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxbase28d_net.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxbase28d_net.lib"
 			>
 			<FileConfiguration
 				Name="Release DLL|Win32"
@@ -709,7 +709,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxbase28d_odbc.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxbase28d_odbc.lib"
 			>
 			<FileConfiguration
 				Name="Release DLL|Win32"
@@ -721,7 +721,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxmsw28_adv.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxmsw28_adv.lib"
 			>
 			<FileConfiguration
 				Name="Debug DLL|Win32"
@@ -733,7 +733,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxmsw28_core.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxmsw28_core.lib"
 			>
 			<FileConfiguration
 				Name="Debug DLL|Win32"
@@ -745,7 +745,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxmsw28d_adv.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxmsw28d_adv.lib"
 			>
 			<FileConfiguration
 				Name="Release DLL|Win32"
@@ -757,7 +757,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxmsw28d_core.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxmsw28d_core.lib"
 			>
 			<FileConfiguration
 				Name="Release DLL|Win32"
diff --git a/projects/Ba1.vcproj b/projects/Ba1.vcproj
index 69adc3919..5e36567b5 100755
--- a/projects/Ba1.vcproj
+++ b/projects/Ba1.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -164,7 +164,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Ba2.vcproj b/projects/Ba2.vcproj
index 8fc83624f..4496c9879 100755
--- a/projects/Ba2.vcproj
+++ b/projects/Ba2.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Ba3.vcproj b/projects/Ba3.vcproj
index 41d2807ac..350c808e0 100755
--- a/projects/Ba3.vcproj
+++ b/projects/Ba3.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Ba4.vcproj b/projects/Ba4.vcproj
index e674a81be..19d014e90 100755
--- a/projects/Ba4.vcproj
+++ b/projects/Ba4.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Ba5.vcproj b/projects/Ba5.vcproj
index 658233a1a..0c79e8498 100755
--- a/projects/Ba5.vcproj
+++ b/projects/Ba5.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Ba6.vcproj b/projects/Ba6.vcproj
index e11ebefec..60efbb07f 100755
--- a/projects/Ba6.vcproj
+++ b/projects/Ba6.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Ba7.vcproj b/projects/Ba7.vcproj
index 796634261..dbcea311d 100755
--- a/projects/Ba7.vcproj
+++ b/projects/Ba7.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Bacnv.vcproj b/projects/Bacnv.vcproj
index d15f62317..254c14b62 100755
--- a/projects/Bacnv.vcproj
+++ b/projects/Bacnv.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Bainst.vcproj b/projects/Bainst.vcproj
index 8eb6c50da..1281e8010 100755
--- a/projects/Bainst.vcproj
+++ b/projects/Bainst.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/BaseServ.vcproj b/projects/BaseServ.vcproj
index 369b1f30a..238dc809d 100755
--- a/projects/BaseServ.vcproj
+++ b/projects/BaseServ.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\wx280\lib\vc_dll\mswd,..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\lib\vc_dll\mswd,..\..\wx283\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;..\..\wx280\include"
+				AdditionalIncludeDirectories="..\server;..\..\wx283\include"
 				ResourceOutputFileName="..\server\DebugDLL/server.res"
 			/>
 			<Tool
@@ -78,7 +78,7 @@
 				OutputFile="../exed/servers/BaseServ.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\wx280\lib"
+				AdditionalLibraryDirectories="..\..\wx283\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;..\..\wx280\include"
+				AdditionalIncludeDirectories="\U\Luca\r020200\server;..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -242,7 +242,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="4"
-				AdditionalIncludeDirectories="..\..\wx280\lib\vc_dll\msw,..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\lib\vc_dll\msw,..\..\wx283\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;..\..\wx280\include"
+				AdditionalIncludeDirectories="\U\Luca\r020200\server;..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -270,7 +270,7 @@
 				OutputFile="D:\Release\Campo40/servers/BaseServ.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\wx280\lib"
+				AdditionalLibraryDirectories="..\..\wx283\lib"
 				IgnoreDefaultLibraryNames="libc.lib,libci.lib"
 				ProgramDatabaseFile=".\..\Release\ReleaseDLLServers/BaseServ.pdb"
 				SubSystem="2"
@@ -336,7 +336,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="\wx280\include"
+				AdditionalIncludeDirectories="\wx283\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;..\..\wx280\include"
+				AdditionalIncludeDirectories="\U\Luca\r020200\server;..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/libpath:&quot;/wx280/lib&quot;"
+				AdditionalOptions="/libpath:&quot;/wx283/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 713fbc092..e2d6faed8 100755
--- a/projects/Cacnv.vcproj
+++ b/projects/Cacnv.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Cg0.vcproj b/projects/Cg0.vcproj
index 3b84372b8..60c12d0ca 100755
--- a/projects/Cg0.vcproj
+++ b/projects/Cg0.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Cg1.vcproj b/projects/Cg1.vcproj
index 866d32aed..cc90ea0c4 100755
--- a/projects/Cg1.vcproj
+++ b/projects/Cg1.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Cg2.vcproj b/projects/Cg2.vcproj
index bd9099778..df55eefa7 100755
--- a/projects/Cg2.vcproj
+++ b/projects/Cg2.vcproj
@@ -67,7 +67,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Cg3.vcproj b/projects/Cg3.vcproj
index 68ab13509..17574e061 100755
--- a/projects/Cg3.vcproj
+++ b/projects/Cg3.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -164,7 +164,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Cg4.vcproj b/projects/Cg4.vcproj
index 0d26e669a..b1d7e71f3 100755
--- a/projects/Cg4.vcproj
+++ b/projects/Cg4.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Cg5.vcproj b/projects/Cg5.vcproj
index be398a24e..4f931732f 100755
--- a/projects/Cg5.vcproj
+++ b/projects/Cg5.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Cg6.vcproj b/projects/Cg6.vcproj
index 2a69b3561..c73f7bf30 100755
--- a/projects/Cg6.vcproj
+++ b/projects/Cg6.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Cg7.vcproj b/projects/Cg7.vcproj
index 5a7090f08..c0a290ed3 100755
--- a/projects/Cg7.vcproj
+++ b/projects/Cg7.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Cgp0.vcproj b/projects/Cgp0.vcproj
index d246233ac..dbbbdd0ca 100755
--- a/projects/Cgp0.vcproj
+++ b/projects/Cgp0.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Cgp1.vcproj b/projects/Cgp1.vcproj
index 3fb391419..e56735c85 100755
--- a/projects/Cgp1.vcproj
+++ b/projects/Cgp1.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Cgp2.vcproj b/projects/Cgp2.vcproj
index 798c0bd92..9d297b31c 100755
--- a/projects/Cgp2.vcproj
+++ b/projects/Cgp2.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Cgp3.vcproj b/projects/Cgp3.vcproj
index d97b8468a..629dd114f 100755
--- a/projects/Cgp3.vcproj
+++ b/projects/Cgp3.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Database.vcproj b/projects/Database.vcproj
index 01cffdb73..75ec60595 100755
--- a/projects/Database.vcproj
+++ b/projects/Database.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\wx280\lib\vc_dll\mswd,..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\lib\vc_dll\mswd,..\..\wx283\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;..\..\wx280\include"
+				AdditionalIncludeDirectories="..\server;..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -76,7 +76,7 @@
 				OutputFile="../exed/servers/DataBase.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\wx280\lib"
+				AdditionalLibraryDirectories="..\..\wx283\lib"
 				IgnoreDefaultLibraryNames="libcd.lib,libcid.lib"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\..\Debug\DebugServers/DataBase.pdb"
@@ -143,7 +143,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="4"
-				AdditionalIncludeDirectories="..\..\wx280\lib\vc_dll\msw,..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\lib\vc_dll\msw,..\..\wx283\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;..\..\wx280\include"
+				AdditionalIncludeDirectories="..\server;..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -171,7 +171,7 @@
 				OutputFile="D:\Release\Campo40/servers/DataBase.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\wx280\lib"
+				AdditionalLibraryDirectories="..\..\wx283\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;..\..\wx280\include"
+				AdditionalIncludeDirectories="\U\Luca\r020200\server;..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/libpath:&quot;/wx280/lib&quot;"
+				AdditionalOptions="/libpath:&quot;/wx283/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;..\..\wx280\include"
+				AdditionalIncludeDirectories="\U\Luca\r020200\server;..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -555,7 +555,7 @@
 					Name="VCResourceCompilerTool"
 					PreprocessorDefinitions=""
 					Culture="1040"
-					AdditionalIncludeDirectories="\U\Luca\R_04_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\wx280\include;$(NoInherit)"
+					AdditionalIncludeDirectories="\U\Luca\R_04_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\wx283\include;$(NoInherit)"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -565,7 +565,7 @@
 					Name="VCResourceCompilerTool"
 					PreprocessorDefinitions=""
 					Culture="1040"
-					AdditionalIncludeDirectories="\U\Luca\R_04_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\wx280\include;$(NoInherit)"
+					AdditionalIncludeDirectories="\U\Luca\R_04_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\wx283\include;$(NoInherit)"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -588,7 +588,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxbase28.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxbase28.lib"
 			>
 			<FileConfiguration
 				Name="Debug DLL|Win32"
@@ -600,7 +600,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxbase28_net.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxbase28_net.lib"
 			>
 			<FileConfiguration
 				Name="Debug DLL|Win32"
@@ -612,7 +612,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxbase28_odbc.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxbase28_odbc.lib"
 			>
 			<FileConfiguration
 				Name="Debug DLL|Win32"
@@ -624,7 +624,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxbase28d.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxbase28d.lib"
 			>
 			<FileConfiguration
 				Name="Release DLL|Win32"
@@ -636,7 +636,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxbase28d_net.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxbase28d_net.lib"
 			>
 			<FileConfiguration
 				Name="Release DLL|Win32"
@@ -648,7 +648,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxbase28d_odbc.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxbase28d_odbc.lib"
 			>
 			<FileConfiguration
 				Name="Release DLL|Win32"
@@ -660,7 +660,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxmsw28_adv.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxmsw28_adv.lib"
 			>
 			<FileConfiguration
 				Name="Debug DLL|Win32"
@@ -672,7 +672,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxmsw28_core.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxmsw28_core.lib"
 			>
 			<FileConfiguration
 				Name="Debug DLL|Win32"
@@ -684,7 +684,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxmsw28d_adv.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxmsw28d_adv.lib"
 			>
 			<FileConfiguration
 				Name="Release DLL|Win32"
@@ -696,7 +696,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxmsw28d_core.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxmsw28d_core.lib"
 			>
 			<FileConfiguration
 				Name="Release DLL|Win32"
diff --git a/projects/Diction.vcproj b/projects/Diction.vcproj
index 58ac53b60..c856f363a 100755
--- a/projects/Diction.vcproj
+++ b/projects/Diction.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\wx280\lib\vc_dll\mswd,..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\lib\vc_dll\mswd,..\..\wx283\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;..\..\wx280\include"
+				AdditionalIncludeDirectories="..\server;..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -76,7 +76,7 @@
 				OutputFile="../exed/servers/Diction.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\wx280\lib"
+				AdditionalLibraryDirectories="..\..\wx283\lib"
 				IgnoreDefaultLibraryNames="libcd.lib,libcid.lib"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\..\Debug\DebugServers/Diction.pdb"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="2057"
-				AdditionalIncludeDirectories="..\server;..\..\wx280\include"
+				AdditionalIncludeDirectories="..\server;..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -240,7 +240,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="4"
-				AdditionalIncludeDirectories="..\..\wx280\lib\vc_dll\msw,..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\lib\vc_dll\msw,..\..\wx283\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;__WINDOWS__;__WXMSW__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT;WXUSINGDLL=1"
 				RuntimeLibrary="2"
 				PrecompiledHeaderFile=".\..\Release\ReleaseDLLServers/Diction.pch"
@@ -257,7 +257,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="2057"
-				AdditionalIncludeDirectories="..\server;..\..\wx280\include"
+				AdditionalIncludeDirectories="..\server;..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -268,7 +268,7 @@
 				OutputFile="D:\Release\Campo40/servers/Diction.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\wx280\lib"
+				AdditionalLibraryDirectories="..\..\wx283\lib"
 				IgnoreDefaultLibraryNames="libc.lib,libci.lib"
 				ProgramDatabaseFile=".\..\Release\ReleaseDLLServers/Diction.pdb"
 				SubSystem="2"
@@ -334,7 +334,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="\wx280\include"
+				AdditionalIncludeDirectories="\wx283\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;__WINDOWS__;__WXMSW__;DEBUG=1;__WXDEBUG__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT"
 				MinimalRebuild="true"
 				RuntimeLibrary="1"
@@ -354,14 +354,14 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="2057"
-				AdditionalIncludeDirectories="\U\Luca\r020200\server;..\..\wx280\include"
+				AdditionalIncludeDirectories="\U\Luca\r020200\server;..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/libpath:&quot;/wx280/lib&quot;"
+				AdditionalOptions="/libpath:&quot;/wx283/lib&quot;"
 				AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib"
 				OutputFile="../exe/servers/Diction.exe"
 				LinkIncremental="2"
@@ -550,7 +550,7 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxbase28.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxbase28.lib"
 			>
 			<FileConfiguration
 				Name="Debug DLL|Win32"
@@ -562,7 +562,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxbase28_net.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxbase28_net.lib"
 			>
 			<FileConfiguration
 				Name="Debug DLL|Win32"
@@ -574,7 +574,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxbase28_odbc.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxbase28_odbc.lib"
 			>
 			<FileConfiguration
 				Name="Debug DLL|Win32"
@@ -586,7 +586,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxbase28d.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxbase28d.lib"
 			>
 			<FileConfiguration
 				Name="Release DLL|Win32"
@@ -598,7 +598,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxbase28d_net.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxbase28d_net.lib"
 			>
 			<FileConfiguration
 				Name="Release DLL|Win32"
@@ -610,7 +610,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxbase28d_odbc.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxbase28d_odbc.lib"
 			>
 			<FileConfiguration
 				Name="Release DLL|Win32"
@@ -622,7 +622,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxmsw28_adv.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxmsw28_adv.lib"
 			>
 			<FileConfiguration
 				Name="Debug DLL|Win32"
@@ -634,7 +634,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxmsw28_core.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxmsw28_core.lib"
 			>
 			<FileConfiguration
 				Name="Debug DLL|Win32"
@@ -646,7 +646,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxmsw28d_adv.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxmsw28d_adv.lib"
 			>
 			<FileConfiguration
 				Name="Release DLL|Win32"
@@ -658,7 +658,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxmsw28d_core.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxmsw28d_core.lib"
 			>
 			<FileConfiguration
 				Name="Release DLL|Win32"
diff --git a/projects/Ef0.vcproj b/projects/Ef0.vcproj
index a20e0a449..31616e068 100755
--- a/projects/Ef0.vcproj
+++ b/projects/Ef0.vcproj
@@ -67,7 +67,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/In0.vcproj b/projects/In0.vcproj
index 406d4ffb5..0107bf2e6 100755
--- a/projects/In0.vcproj
+++ b/projects/In0.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/InstallShield.dsp b/projects/InstallShield.dsp
index b4fb18db7..8b4d8eaad 100755
--- a/projects/InstallShield.dsp
+++ b/projects/InstallShield.dsp
@@ -48,7 +48,7 @@ RSC=rc.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x410 /d "NDEBUG"
-# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG"
+# ADD RSC /l 0x410 /i "..\..\wx283\include" /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
diff --git a/projects/Lerch.vcproj b/projects/Lerch.vcproj
index b35ed81d5..8c998cd94 100755
--- a/projects/Lerch.vcproj
+++ b/projects/Lerch.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\wx280\lib\vc_dll\mswd,..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\lib\vc_dll\mswd,..\..\wx283\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;..\..\wx280\include"
+				AdditionalIncludeDirectories="..\server;..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -77,7 +77,7 @@
 				OutputFile="../exed/servers/Lerch.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\wx280\lib"
+				AdditionalLibraryDirectories="..\..\wx283\lib"
 				IgnoreDefaultLibraryNames="libcd.lib,libcid.lib"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\..\Debug\DebugServers/Lerch.pdb"
@@ -144,7 +144,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="\wx280\include"
+				AdditionalIncludeDirectories="\wx283\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;__WINDOWS__;__WXMSW__;DEBUG=1;__WXDEBUG__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT"
 				MinimalRebuild="true"
 				RuntimeLibrary="1"
@@ -164,14 +164,14 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="2057"
-				AdditionalIncludeDirectories="\U\Luca\r020200\server;..\..\wx280\include"
+				AdditionalIncludeDirectories="\U\Luca\r020200\server;..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/libpath:&quot;/wx280/lib&quot;"
+				AdditionalOptions="/libpath:&quot;/wx283/lib&quot;"
 				AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib"
 				OutputFile="../exe/servers/Lerch.exe"
 				LinkIncremental="2"
@@ -262,7 +262,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="2057"
-				AdditionalIncludeDirectories="\U\Luca\r020200\server;..\..\wx280\include"
+				AdditionalIncludeDirectories="\U\Luca\r020200\server;..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -339,7 +339,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="4"
-				AdditionalIncludeDirectories="..\..\wx280\lib\vc_dll\msw,..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\lib\vc_dll\msw,..\..\wx283\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;__WINDOWS__;__WXMSW__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT;WXUSINGDLL=1"
 				RuntimeLibrary="2"
 				PrecompiledHeaderFile=".\..\Release\ReleaseDLLServers/Lerch.pch"
@@ -356,7 +356,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="2057"
-				AdditionalIncludeDirectories="..\server;..\..\wx280\include"
+				AdditionalIncludeDirectories="..\server;..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -367,7 +367,7 @@
 				OutputFile="D:\Release\Campo40/servers/Lerch.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\wx280\lib"
+				AdditionalLibraryDirectories="..\..\wx283\lib"
 				IgnoreDefaultLibraryNames="libc.lib,libci.lib"
 				ProgramDatabaseFile=".\..\Release\ReleaseDLLServers/Lerch.pdb"
 				SubSystem="2"
@@ -534,15 +534,15 @@
 			Filter="h"
 			>
 			<File
-				RelativePath="BaseServ.h"
+				RelativePath="..\server\baseserv.h"
 				>
 			</File>
 			<File
-				RelativePath="Lerch.h"
+				RelativePath="..\server\lerch.h"
 				>
 			</File>
 			<File
-				RelativePath="xml.h"
+				RelativePath="..\server\xml.h"
 				>
 			</File>
 		</Filter>
@@ -556,7 +556,7 @@
 					Name="VCResourceCompilerTool"
 					PreprocessorDefinitions=""
 					Culture="1040"
-					AdditionalIncludeDirectories="\U\Luca\R_04_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\wx280\include;$(NoInherit)"
+					AdditionalIncludeDirectories="\U\Luca\R_04_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\wx283\include;$(NoInherit)"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -584,12 +584,12 @@
 					Name="VCResourceCompilerTool"
 					PreprocessorDefinitions=""
 					Culture="1040"
-					AdditionalIncludeDirectories="\U\Luca\R_04_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\wx280\include;$(NoInherit)"
+					AdditionalIncludeDirectories="\U\Luca\R_04_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\wx283\include;$(NoInherit)"
 				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxbase28.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxbase28.lib"
 			>
 			<FileConfiguration
 				Name="Debug DLL|Win32"
@@ -601,7 +601,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxbase28_net.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxbase28_net.lib"
 			>
 			<FileConfiguration
 				Name="Debug DLL|Win32"
@@ -613,7 +613,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxbase28_odbc.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxbase28_odbc.lib"
 			>
 			<FileConfiguration
 				Name="Debug DLL|Win32"
@@ -625,7 +625,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxbase28d.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxbase28d.lib"
 			>
 			<FileConfiguration
 				Name="Release DLL|Win32"
@@ -637,7 +637,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxbase28d_net.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxbase28d_net.lib"
 			>
 			<FileConfiguration
 				Name="Release DLL|Win32"
@@ -649,7 +649,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxbase28d_odbc.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxbase28d_odbc.lib"
 			>
 			<FileConfiguration
 				Name="Release DLL|Win32"
@@ -661,7 +661,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxmsw28_adv.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxmsw28_adv.lib"
 			>
 			<FileConfiguration
 				Name="Debug DLL|Win32"
@@ -673,7 +673,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxmsw28_core.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxmsw28_core.lib"
 			>
 			<FileConfiguration
 				Name="Debug DLL|Win32"
@@ -685,7 +685,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxmsw28d_adv.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxmsw28d_adv.lib"
 			>
 			<FileConfiguration
 				Name="Release DLL|Win32"
@@ -697,7 +697,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxmsw28d_core.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxmsw28d_core.lib"
 			>
 			<FileConfiguration
 				Name="Release DLL|Win32"
diff --git a/projects/Or1.vcproj b/projects/Or1.vcproj
index 8e5d0ee09..ae96cb64d 100755
--- a/projects/Or1.vcproj
+++ b/projects/Or1.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Sc0.vcproj b/projects/Sc0.vcproj
index bb90e84a4..953bf8191 100755
--- a/projects/Sc0.vcproj
+++ b/projects/Sc0.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Sc1.vcproj b/projects/Sc1.vcproj
index 0b91a4f4b..75698ec83 100755
--- a/projects/Sc1.vcproj
+++ b/projects/Sc1.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="\wx280\include;..\..\wx280\include"
+				AdditionalIncludeDirectories="\wx283\include;..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -470,7 +470,7 @@
 				<Tool
 					Name="VCResourceCompilerTool"
 					PreprocessorDefinitions=""
-					AdditionalIncludeDirectories="..\..\wx280\include;$(NoInherit)"
+					AdditionalIncludeDirectories="..\..\wx283\include;$(NoInherit)"
 				/>
 			</FileConfiguration>
 		</File>
diff --git a/projects/Sc2.vcproj b/projects/Sc2.vcproj
index 08626db11..fa1b6aea7 100755
--- a/projects/Sc2.vcproj
+++ b/projects/Sc2.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/Sc3.vcproj b/projects/Sc3.vcproj
index 275d57e65..7057cbec4 100755
--- a/projects/Sc3.vcproj
+++ b/projects/Sc3.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="\wx280\include;..\..\wx280\include"
+				AdditionalIncludeDirectories="\wx283\include;..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -425,7 +425,7 @@
 				<Tool
 					Name="VCResourceCompilerTool"
 					PreprocessorDefinitions=""
-					AdditionalIncludeDirectories="..\..\wx280\include;$(NoInherit)"
+					AdditionalIncludeDirectories="..\..\wx283\include;$(NoInherit)"
 				/>
 			</FileConfiguration>
 		</File>
diff --git a/projects/ab0.rc b/projects/ab0.rc
index 7e931c0f4..f03108047 100755
--- a/projects/ab0.rc
+++ b/projects/ab0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/ab0.vcproj b/projects/ab0.vcproj
index fc91f8cc7..401038f5d 100755
--- a/projects/ab0.vcproj
+++ b/projects/ab0.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ab1.rc b/projects/ab1.rc
index 7e931c0f4..f03108047 100755
--- a/projects/ab1.rc
+++ b/projects/ab1.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/ab1.vcproj b/projects/ab1.vcproj
index 75fd460a4..5a6253667 100755
--- a/projects/ab1.vcproj
+++ b/projects/ab1.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ab2.rc b/projects/ab2.rc
index 7e931c0f4..f03108047 100755
--- a/projects/ab2.rc
+++ b/projects/ab2.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/ab2.vcproj b/projects/ab2.vcproj
index 3c18f5a6e..82c58a168 100755
--- a/projects/ab2.vcproj
+++ b/projects/ab2.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ab3.rc b/projects/ab3.rc
index 7e931c0f4..f03108047 100755
--- a/projects/ab3.rc
+++ b/projects/ab3.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/ab3.vcproj b/projects/ab3.vcproj
index a850bc1f3..895a6f8be 100755
--- a/projects/ab3.vcproj
+++ b/projects/ab3.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ba0.rc b/projects/ba0.rc
index 25fcb7702..c810f0910 100755
--- a/projects/ba0.rc
+++ b/projects/ba0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/campo.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/ba0.vcproj b/projects/ba0.vcproj
index de1c502bf..74cadebb9 100755
--- a/projects/ba0.vcproj
+++ b/projects/ba0.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ba1.rc b/projects/ba1.rc
index 7e931c0f4..f03108047 100755
--- a/projects/ba1.rc
+++ b/projects/ba1.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/ba2.rc b/projects/ba2.rc
index 7e931c0f4..f03108047 100755
--- a/projects/ba2.rc
+++ b/projects/ba2.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/ba3.rc b/projects/ba3.rc
index 7e931c0f4..f03108047 100755
--- a/projects/ba3.rc
+++ b/projects/ba3.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/ba4.rc b/projects/ba4.rc
index 7e931c0f4..f03108047 100755
--- a/projects/ba4.rc
+++ b/projects/ba4.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/ba5.rc b/projects/ba5.rc
index 7e931c0f4..f03108047 100755
--- a/projects/ba5.rc
+++ b/projects/ba5.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/ba6.rc b/projects/ba6.rc
index 7e931c0f4..f03108047 100755
--- a/projects/ba6.rc
+++ b/projects/ba6.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/ba7.rc b/projects/ba7.rc
index 7e931c0f4..f03108047 100755
--- a/projects/ba7.rc
+++ b/projects/ba7.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/ba8.rc b/projects/ba8.rc
index 7e931c0f4..f03108047 100755
--- a/projects/ba8.rc
+++ b/projects/ba8.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/ba8.vcproj b/projects/ba8.vcproj
index 9ef2bfe87..669aa5bac 100755
--- a/projects/ba8.vcproj
+++ b/projects/ba8.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/bacnv.rc b/projects/bacnv.rc
index 7e931c0f4..f03108047 100755
--- a/projects/bacnv.rc
+++ b/projects/bacnv.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/bainst.rc b/projects/bainst.rc
index 7e931c0f4..f03108047 100755
--- a/projects/bainst.rc
+++ b/projects/bainst.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/ca0.rc b/projects/ca0.rc
index 7e931c0f4..f03108047 100755
--- a/projects/ca0.rc
+++ b/projects/ca0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/ca0.vcproj b/projects/ca0.vcproj
index 922ac3a60..9554da29f 100755
--- a/projects/ca0.vcproj
+++ b/projects/ca0.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ca1.rc b/projects/ca1.rc
index 7e931c0f4..f03108047 100755
--- a/projects/ca1.rc
+++ b/projects/ca1.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/ca1.vcproj b/projects/ca1.vcproj
index f80caa9f9..062978ba4 100755
--- a/projects/ca1.vcproj
+++ b/projects/ca1.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ca2.rc b/projects/ca2.rc
index 7e931c0f4..f03108047 100755
--- a/projects/ca2.rc
+++ b/projects/ca2.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/ca2.vcproj b/projects/ca2.vcproj
index 0f2a51dba..078c8837d 100755
--- a/projects/ca2.vcproj
+++ b/projects/ca2.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ca3.rc b/projects/ca3.rc
index 7e931c0f4..f03108047 100755
--- a/projects/ca3.rc
+++ b/projects/ca3.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/ca3.vcproj b/projects/ca3.vcproj
index b5c21c655..5be187d12 100755
--- a/projects/ca3.vcproj
+++ b/projects/ca3.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/cacnv.rc b/projects/cacnv.rc
index 7e931c0f4..f03108047 100755
--- a/projects/cacnv.rc
+++ b/projects/cacnv.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/ce0.rc b/projects/ce0.rc
index 7e931c0f4..f03108047 100755
--- a/projects/ce0.rc
+++ b/projects/ce0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/ce0.vcproj b/projects/ce0.vcproj
index 3e1519be9..4050659c5 100755
--- a/projects/ce0.vcproj
+++ b/projects/ce0.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ce1.rc b/projects/ce1.rc
index 7e931c0f4..f03108047 100755
--- a/projects/ce1.rc
+++ b/projects/ce1.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/ce1.vcproj b/projects/ce1.vcproj
index da809b4e3..4ff5f0031 100755
--- a/projects/ce1.vcproj
+++ b/projects/ce1.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ce2.rc b/projects/ce2.rc
index 7e931c0f4..f03108047 100755
--- a/projects/ce2.rc
+++ b/projects/ce2.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/ce2.vcproj b/projects/ce2.vcproj
index fb336123b..5d16b4452 100755
--- a/projects/ce2.vcproj
+++ b/projects/ce2.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ce3.rc b/projects/ce3.rc
index 7e931c0f4..f03108047 100755
--- a/projects/ce3.rc
+++ b/projects/ce3.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/ce3.vcproj b/projects/ce3.vcproj
index a3f8bd7f6..7412e9b07 100755
--- a/projects/ce3.vcproj
+++ b/projects/ce3.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ce4.rc b/projects/ce4.rc
index 7e931c0f4..f03108047 100755
--- a/projects/ce4.rc
+++ b/projects/ce4.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/ce4.vcproj b/projects/ce4.vcproj
index b91bc1974..c3e0a6cb7 100755
--- a/projects/ce4.vcproj
+++ b/projects/ce4.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -164,7 +164,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/cg.sln b/projects/cg.sln
index 9d89d2020..694f25ee5 100755
--- a/projects/cg.sln
+++ b/projects/cg.sln
@@ -15,11 +15,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cg5", "Cg5.vcproj", "{4661E
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cg6", "Cg6.vcproj", "{4FD17D56-D966-4F85-A04A-28EC6E0824CF}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cg7", "Cg7.vcproj", "{03D7DF6B-8F3C-40BE-87D4-CB1BC94D8264}"
-	ProjectSection(ProjectDependencies) = postProject
-		{2BB8AD01-5DF1-48E1-BB20-F59C0E3B540F} = {2BB8AD01-5DF1-48E1-BB20-F59C0E3B540F}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cg_masktab", "cg_masktab.vcproj", "{97368DC9-8B0D-4F75-A89F-9A58701226B6}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cgp0", "Cgp0.vcproj", "{042F179F-DBD4-4937-A3B6-B39B1C4352CA}"
@@ -30,8 +25,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cgp2", "Cgp2.vcproj", "{452
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cgp3", "Cgp3.vcproj", "{2B6227AE-CEA9-43C6-93CB-A226691260DB}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedoc", "vedoc.vcproj", "{2BB8AD01-5DF1-48E1-BB20-F59C0E3B540F}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -66,10 +59,6 @@ Global
 		{4FD17D56-D966-4F85-A04A-28EC6E0824CF}.Debug|Win32.Build.0 = Debug|Win32
 		{4FD17D56-D966-4F85-A04A-28EC6E0824CF}.Release|Win32.ActiveCfg = Release|Win32
 		{4FD17D56-D966-4F85-A04A-28EC6E0824CF}.Release|Win32.Build.0 = Release|Win32
-		{03D7DF6B-8F3C-40BE-87D4-CB1BC94D8264}.Debug|Win32.ActiveCfg = Debug|Win32
-		{03D7DF6B-8F3C-40BE-87D4-CB1BC94D8264}.Debug|Win32.Build.0 = Debug|Win32
-		{03D7DF6B-8F3C-40BE-87D4-CB1BC94D8264}.Release|Win32.ActiveCfg = Release|Win32
-		{03D7DF6B-8F3C-40BE-87D4-CB1BC94D8264}.Release|Win32.Build.0 = Release|Win32
 		{97368DC9-8B0D-4F75-A89F-9A58701226B6}.Debug|Win32.ActiveCfg = Debug|Win32
 		{97368DC9-8B0D-4F75-A89F-9A58701226B6}.Debug|Win32.Build.0 = Debug|Win32
 		{97368DC9-8B0D-4F75-A89F-9A58701226B6}.Release|Win32.ActiveCfg = Release|Win32
@@ -90,10 +79,6 @@ Global
 		{2B6227AE-CEA9-43C6-93CB-A226691260DB}.Debug|Win32.Build.0 = Debug|Win32
 		{2B6227AE-CEA9-43C6-93CB-A226691260DB}.Release|Win32.ActiveCfg = Release|Win32
 		{2B6227AE-CEA9-43C6-93CB-A226691260DB}.Release|Win32.Build.0 = Release|Win32
-		{2BB8AD01-5DF1-48E1-BB20-F59C0E3B540F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2BB8AD01-5DF1-48E1-BB20-F59C0E3B540F}.Debug|Win32.Build.0 = Debug|Win32
-		{2BB8AD01-5DF1-48E1-BB20-F59C0E3B540F}.Release|Win32.ActiveCfg = Release|Win32
-		{2BB8AD01-5DF1-48E1-BB20-F59C0E3B540F}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/projects/cg0.rc b/projects/cg0.rc
index 7e931c0f4..f03108047 100755
--- a/projects/cg0.rc
+++ b/projects/cg0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/cg1.rc b/projects/cg1.rc
index 7e931c0f4..f03108047 100755
--- a/projects/cg1.rc
+++ b/projects/cg1.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/cg2.rc b/projects/cg2.rc
index 7e931c0f4..f03108047 100755
--- a/projects/cg2.rc
+++ b/projects/cg2.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/cg3.rc b/projects/cg3.rc
index 7e931c0f4..f03108047 100755
--- a/projects/cg3.rc
+++ b/projects/cg3.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/cg4.rc b/projects/cg4.rc
index 7e931c0f4..f03108047 100755
--- a/projects/cg4.rc
+++ b/projects/cg4.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/cg5.rc b/projects/cg5.rc
index 7e931c0f4..f03108047 100755
--- a/projects/cg5.rc
+++ b/projects/cg5.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/cg6.rc b/projects/cg6.rc
index 7e931c0f4..f03108047 100755
--- a/projects/cg6.rc
+++ b/projects/cg6.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/cg7.rc b/projects/cg7.rc
index 7e931c0f4..f03108047 100755
--- a/projects/cg7.rc
+++ b/projects/cg7.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/cgp0.rc b/projects/cgp0.rc
index 7e931c0f4..f03108047 100755
--- a/projects/cgp0.rc
+++ b/projects/cgp0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/cgp1.rc b/projects/cgp1.rc
index 7e931c0f4..f03108047 100755
--- a/projects/cgp1.rc
+++ b/projects/cgp1.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/cgp2.rc b/projects/cgp2.rc
index 7e931c0f4..f03108047 100755
--- a/projects/cgp2.rc
+++ b/projects/cgp2.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/cgp3.rc b/projects/cgp3.rc
index 7e931c0f4..f03108047 100755
--- a/projects/cgp3.rc
+++ b/projects/cgp3.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/cgp4.rc b/projects/cgp4.rc
index 7e931c0f4..f03108047 100755
--- a/projects/cgp4.rc
+++ b/projects/cgp4.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/ci0.rc b/projects/ci0.rc
index fa51c2379..42d0b4938 100755
--- a/projects/ci0.rc
+++ b/projects/ci0.rc
@@ -1,3 +1,3 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
\ No newline at end of file
+rcinclude ../../wx283/include/wx/msw/wx.rc
\ No newline at end of file
diff --git a/projects/ci0.vcproj b/projects/ci0.vcproj
index a3c700908..8990b1598 100755
--- a/projects/ci0.vcproj
+++ b/projects/ci0.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ci1.rc b/projects/ci1.rc
index fa51c2379..42d0b4938 100755
--- a/projects/ci1.rc
+++ b/projects/ci1.rc
@@ -1,3 +1,3 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
\ No newline at end of file
+rcinclude ../../wx283/include/wx/msw/wx.rc
\ No newline at end of file
diff --git a/projects/ci1.vcproj b/projects/ci1.vcproj
index dc0aa8052..e66843bce 100755
--- a/projects/ci1.vcproj
+++ b/projects/ci1.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/cm0.rc b/projects/cm0.rc
index 7e931c0f4..f03108047 100755
--- a/projects/cm0.rc
+++ b/projects/cm0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/cm1.rc b/projects/cm1.rc
index 7e931c0f4..f03108047 100755
--- a/projects/cm1.rc
+++ b/projects/cm1.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/coffee.vcproj b/projects/coffee.vcproj
index db51da00c..a3f82b8e1 100755
--- a/projects/coffee.vcproj
+++ b/projects/coffee.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="4"
-				AdditionalIncludeDirectories="..\..\wx280\lib\vc_dll\msw,..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\lib\vc_dll\msw,..\..\wx283\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;__WINDOWS__;__WXMSW__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT;WXUSINGDLL=1"
 				RuntimeLibrary="2"
 				PrecompiledHeaderFile=".\..\Release\ReleaseDLLServers/coffee.pch"
@@ -63,7 +63,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="2057"
-				AdditionalIncludeDirectories="..\server;..\..\wx280\include"
+				AdditionalIncludeDirectories="..\server;..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -74,7 +74,7 @@
 				OutputFile="D:\Release\Campo40/servers/Coffee.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\wx280\lib"
+				AdditionalLibraryDirectories="..\..\wx283\lib"
 				IgnoreDefaultLibraryNames="libc.lib,libci.lib"
 				ProgramDatabaseFile=".\..\Release\ReleaseDLLServers/Coffee.pdb"
 				SubSystem="2"
@@ -140,7 +140,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="\wx280\include"
+				AdditionalIncludeDirectories="\wx283\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;__WINDOWS__;__WXMSW__;DEBUG=1;__WXDEBUG__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT"
 				MinimalRebuild="true"
 				RuntimeLibrary="1"
@@ -160,14 +160,14 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="2057"
-				AdditionalIncludeDirectories="\U\Luca\r020200\server;..\..\wx280\include"
+				AdditionalIncludeDirectories="\U\Luca\r020200\server;..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/libpath:&quot;/wx280/lib&quot;"
+				AdditionalOptions="/libpath:&quot;/wx283/lib&quot;"
 				AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib"
 				OutputFile="../exe/servers/Coffee.exe"
 				LinkIncremental="2"
@@ -258,7 +258,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="2057"
-				AdditionalIncludeDirectories="\U\Luca\r020200\server;..\..\wx280\include"
+				AdditionalIncludeDirectories="\U\Luca\r020200\server;..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -335,7 +335,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\wx280\lib\vc_dll\mswd,..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\lib\vc_dll\mswd,..\..\wx283\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;__WINDOWS__;__WXMSW__;DEBUG=1;__WXDEBUG__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT;WXUSINGDLL=1"
 				MinimalRebuild="true"
 				RuntimeLibrary="3"
@@ -354,7 +354,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="2057"
-				AdditionalIncludeDirectories="..\server;..\..\wx280\include"
+				AdditionalIncludeDirectories="..\server;..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -365,7 +365,7 @@
 				OutputFile="../exed/servers/Coffee.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\wx280\lib"
+				AdditionalLibraryDirectories="..\..\wx283\lib"
 				IgnoreDefaultLibraryNames="libcd.lib,libcid.lib"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\..\Debug\DebugServers/Coffee.pdb"
@@ -555,7 +555,7 @@
 					Name="VCResourceCompilerTool"
 					PreprocessorDefinitions=""
 					Culture="1040"
-					AdditionalIncludeDirectories="\U\Luca\R_04_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\wx280\include;$(NoInherit)"
+					AdditionalIncludeDirectories="\U\Luca\R_04_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\wx283\include;$(NoInherit)"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -583,12 +583,12 @@
 					Name="VCResourceCompilerTool"
 					PreprocessorDefinitions=""
 					Culture="1040"
-					AdditionalIncludeDirectories="\U\Luca\R_04_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\wx280\include;$(NoInherit)"
+					AdditionalIncludeDirectories="\U\Luca\R_04_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\wx283\include;$(NoInherit)"
 				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxbase28.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxbase28.lib"
 			>
 			<FileConfiguration
 				Name="Debug DLL|Win32"
@@ -600,7 +600,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxbase28_net.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxbase28_net.lib"
 			>
 			<FileConfiguration
 				Name="Debug DLL|Win32"
@@ -612,7 +612,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxbase28_odbc.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxbase28_odbc.lib"
 			>
 			<FileConfiguration
 				Name="Debug DLL|Win32"
@@ -624,7 +624,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxbase28d.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxbase28d.lib"
 			>
 			<FileConfiguration
 				Name="Release DLL|Win32"
@@ -636,7 +636,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxbase28d_net.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxbase28d_net.lib"
 			>
 			<FileConfiguration
 				Name="Release DLL|Win32"
@@ -648,7 +648,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxbase28d_odbc.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxbase28d_odbc.lib"
 			>
 			<FileConfiguration
 				Name="Release DLL|Win32"
@@ -660,7 +660,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxmsw28_adv.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxmsw28_adv.lib"
 			>
 			<FileConfiguration
 				Name="Debug DLL|Win32"
@@ -672,7 +672,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxmsw28_core.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxmsw28_core.lib"
 			>
 			<FileConfiguration
 				Name="Debug DLL|Win32"
@@ -684,7 +684,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxmsw28d_adv.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxmsw28d_adv.lib"
 			>
 			<FileConfiguration
 				Name="Release DLL|Win32"
@@ -696,7 +696,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxmsw28d_core.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxmsw28d_core.lib"
 			>
 			<FileConfiguration
 				Name="Release DLL|Win32"
diff --git a/projects/crpa0.rc b/projects/crpa0.rc
index 7e931c0f4..f03108047 100755
--- a/projects/crpa0.rc
+++ b/projects/crpa0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/crpa0.vcproj b/projects/crpa0.vcproj
index f528b6bf4..f22559fc9 100755
--- a/projects/crpa0.vcproj
+++ b/projects/crpa0.vcproj
@@ -67,7 +67,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/crpa1.rc b/projects/crpa1.rc
index 7e931c0f4..f03108047 100755
--- a/projects/crpa1.rc
+++ b/projects/crpa1.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/crpa1.vcproj b/projects/crpa1.vcproj
index fdfa00744..2c083ca3e 100755
--- a/projects/crpa1.vcproj
+++ b/projects/crpa1.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -164,7 +164,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/db0.rc b/projects/db0.rc
index 7e931c0f4..f03108047 100755
--- a/projects/db0.rc
+++ b/projects/db0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/db0.vcproj b/projects/db0.vcproj
index 6ae1213a6..148369eea 100755
--- a/projects/db0.vcproj
+++ b/projects/db0.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/db1.rc b/projects/db1.rc
index 7e931c0f4..f03108047 100755
--- a/projects/db1.rc
+++ b/projects/db1.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/db1.vcproj b/projects/db1.vcproj
index df9d55ee8..0d5a66386 100755
--- a/projects/db1.vcproj
+++ b/projects/db1.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/db2.rc b/projects/db2.rc
index 7e931c0f4..f03108047 100755
--- a/projects/db2.rc
+++ b/projects/db2.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/db2.vcproj b/projects/db2.vcproj
index 87842ce0f..11ed56e58 100755
--- a/projects/db2.vcproj
+++ b/projects/db2.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/dl0.rc b/projects/dl0.rc
index 7e931c0f4..f03108047 100755
--- a/projects/dl0.rc
+++ b/projects/dl0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/dlinst.rc b/projects/dlinst.rc
index 7e931c0f4..f03108047 100755
--- a/projects/dlinst.rc
+++ b/projects/dlinst.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/dt0.rc b/projects/dt0.rc
index 7e931c0f4..f03108047 100755
--- a/projects/dt0.rc
+++ b/projects/dt0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/dt0.vcproj b/projects/dt0.vcproj
index a9ce5d08c..a9a8bfc18 100755
--- a/projects/dt0.vcproj
+++ b/projects/dt0.vcproj
@@ -67,7 +67,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ef0.rc b/projects/ef0.rc
index 7e931c0f4..f03108047 100755
--- a/projects/ef0.rc
+++ b/projects/ef0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/gv0.rc b/projects/gv0.rc
index 41a996650..9188b05af 100755
--- a/projects/gv0.rc
+++ b/projects/gv0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../exed/res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/gv0.vcproj b/projects/gv0.vcproj
index 0890eeeec..758483b65 100755
--- a/projects/gv0.vcproj
+++ b/projects/gv0.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/in0.rc b/projects/in0.rc
index 7e931c0f4..f03108047 100755
--- a/projects/in0.rc
+++ b/projects/in0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/li0.rc b/projects/li0.rc
index 7e931c0f4..f03108047 100755
--- a/projects/li0.rc
+++ b/projects/li0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/li0.vcproj b/projects/li0.vcproj
index 7d2df240c..22a6315a3 100755
--- a/projects/li0.vcproj
+++ b/projects/li0.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -164,7 +164,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/mg0.rc b/projects/mg0.rc
index 7e931c0f4..f03108047 100755
--- a/projects/mg0.rc
+++ b/projects/mg0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/mg0.vcproj b/projects/mg0.vcproj
index 2c4035b03..23c2bf515 100755
--- a/projects/mg0.vcproj
+++ b/projects/mg0.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/mg1.rc b/projects/mg1.rc
index 7e931c0f4..f03108047 100755
--- a/projects/mg1.rc
+++ b/projects/mg1.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/mg1.vcproj b/projects/mg1.vcproj
index 3ff95f414..dc4863365 100755
--- a/projects/mg1.vcproj
+++ b/projects/mg1.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/mg3.rc b/projects/mg3.rc
index 7e931c0f4..f03108047 100755
--- a/projects/mg3.rc
+++ b/projects/mg3.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/mg3.vcproj b/projects/mg3.vcproj
index d44c0d623..a7879871d 100755
--- a/projects/mg3.vcproj
+++ b/projects/mg3.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/mg4.rc b/projects/mg4.rc
index 7e931c0f4..f03108047 100755
--- a/projects/mg4.rc
+++ b/projects/mg4.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/mg4.vcproj b/projects/mg4.vcproj
index a38aec25a..6ae4c0c47 100755
--- a/projects/mg4.vcproj
+++ b/projects/mg4.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/mr0.rc b/projects/mr0.rc
index 7e931c0f4..f03108047 100755
--- a/projects/mr0.rc
+++ b/projects/mr0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/mr0.vcproj b/projects/mr0.vcproj
index 0dd6af922..88643d69d 100755
--- a/projects/mr0.vcproj
+++ b/projects/mr0.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/mr1.rc b/projects/mr1.rc
index 7e931c0f4..f03108047 100755
--- a/projects/mr1.rc
+++ b/projects/mr1.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/mr1.vcproj b/projects/mr1.vcproj
index b000a0941..63c29ca54 100755
--- a/projects/mr1.vcproj
+++ b/projects/mr1.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/mr2.rc b/projects/mr2.rc
index 7e931c0f4..f03108047 100755
--- a/projects/mr2.rc
+++ b/projects/mr2.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/mr2.vcproj b/projects/mr2.vcproj
index 65882da80..84f877fd0 100755
--- a/projects/mr2.vcproj
+++ b/projects/mr2.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/omnia0.rc b/projects/omnia0.rc
index 7e931c0f4..f03108047 100755
--- a/projects/omnia0.rc
+++ b/projects/omnia0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/or1.rc b/projects/or1.rc
index 7e931c0f4..f03108047 100755
--- a/projects/or1.rc
+++ b/projects/or1.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/pd1579.rc b/projects/pd1579.rc
index 7e931c0f4..f03108047 100755
--- a/projects/pd1579.rc
+++ b/projects/pd1579.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/pd1890.rc b/projects/pd1890.rc
index 7e931c0f4..f03108047 100755
--- a/projects/pd1890.rc
+++ b/projects/pd1890.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/pd6030.rc b/projects/pd6030.rc
index 7e931c0f4..f03108047 100755
--- a/projects/pd6030.rc
+++ b/projects/pd6030.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/pg0069.rc b/projects/pg0069.rc
index 41a996650..9188b05af 100755
--- a/projects/pg0069.rc
+++ b/projects/pg0069.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../exed/res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/pg0388.rc b/projects/pg0388.rc
index 41a996650..9188b05af 100755
--- a/projects/pg0388.rc
+++ b/projects/pg0388.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../exed/res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/pr0.rc b/projects/pr0.rc
index 7e931c0f4..f03108047 100755
--- a/projects/pr0.rc
+++ b/projects/pr0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/pr0.vcproj b/projects/pr0.vcproj
index a1d8b6522..8b677bc74 100755
--- a/projects/pr0.vcproj
+++ b/projects/pr0.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/pr1.rc b/projects/pr1.rc
index 7e931c0f4..f03108047 100755
--- a/projects/pr1.rc
+++ b/projects/pr1.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/pr1.vcproj b/projects/pr1.vcproj
index 96f0443ee..99b044a89 100755
--- a/projects/pr1.vcproj
+++ b/projects/pr1.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ps0544.rc b/projects/ps0544.rc
index 41a996650..9188b05af 100755
--- a/projects/ps0544.rc
+++ b/projects/ps0544.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../exed/res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/ps0816.rc b/projects/ps0816.rc
index 7e931c0f4..f03108047 100755
--- a/projects/ps0816.rc
+++ b/projects/ps0816.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/ps0872.rc b/projects/ps0872.rc
index 7e931c0f4..f03108047 100755
--- a/projects/ps0872.rc
+++ b/projects/ps0872.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/ps0913.rc b/projects/ps0913.rc
index 41a996650..9188b05af 100755
--- a/projects/ps0913.rc
+++ b/projects/ps0913.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../exed/res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/ps0920.rc b/projects/ps0920.rc
index 41a996650..9188b05af 100755
--- a/projects/ps0920.rc
+++ b/projects/ps0920.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../exed/res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/pt0195.rc b/projects/pt0195.rc
index 41a996650..9188b05af 100755
--- a/projects/pt0195.rc
+++ b/projects/pt0195.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../exed/res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/sc0.rc b/projects/sc0.rc
index 7e931c0f4..f03108047 100755
--- a/projects/sc0.rc
+++ b/projects/sc0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/sc1.rc b/projects/sc1.rc
index 7e931c0f4..f03108047 100755
--- a/projects/sc1.rc
+++ b/projects/sc1.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/sc2.rc b/projects/sc2.rc
index 7e931c0f4..f03108047 100755
--- a/projects/sc2.rc
+++ b/projects/sc2.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/sc3.rc b/projects/sc3.rc
index 7e931c0f4..f03108047 100755
--- a/projects/sc3.rc
+++ b/projects/sc3.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/si0.rc b/projects/si0.rc
index 7e931c0f4..f03108047 100755
--- a/projects/si0.rc
+++ b/projects/si0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/sv0.rc b/projects/sv0.rc
index 7e931c0f4..f03108047 100755
--- a/projects/sv0.rc
+++ b/projects/sv0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/sv0.vcproj b/projects/sv0.vcproj
index 0ad79ae77..43d32fb5b 100755
--- a/projects/sv0.vcproj
+++ b/projects/sv0.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/sv1.rc b/projects/sv1.rc
index 7e931c0f4..f03108047 100755
--- a/projects/sv1.rc
+++ b/projects/sv1.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/sv1.vcproj b/projects/sv1.vcproj
index 0699b1157..1339562b5 100755
--- a/projects/sv1.vcproj
+++ b/projects/sv1.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -164,7 +164,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/sv2.rc b/projects/sv2.rc
index 7e931c0f4..f03108047 100755
--- a/projects/sv2.rc
+++ b/projects/sv2.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/sv2.vcproj b/projects/sv2.vcproj
index 11f6f526b..3c90c9cf1 100755
--- a/projects/sv2.vcproj
+++ b/projects/sv2.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/tc0.rc b/projects/tc0.rc
index 41a996650..9188b05af 100755
--- a/projects/tc0.rc
+++ b/projects/tc0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../exed/res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/tc0.vcproj b/projects/tc0.vcproj
index eec328406..5d0d11008 100755
--- a/projects/tc0.vcproj
+++ b/projects/tc0.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/tc1.rc b/projects/tc1.rc
index 41a996650..9188b05af 100755
--- a/projects/tc1.rc
+++ b/projects/tc1.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../exed/res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/tc1.vcproj b/projects/tc1.vcproj
index 1d402f907..95fa278d3 100755
--- a/projects/tc1.vcproj
+++ b/projects/tc1.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/tc9.rc b/projects/tc9.rc
index 41a996650..9188b05af 100755
--- a/projects/tc9.rc
+++ b/projects/tc9.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../exed/res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/tc9.vcproj b/projects/tc9.vcproj
index bd5d8a863..914089ce5 100755
--- a/projects/tc9.vcproj
+++ b/projects/tc9.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/tp0.rc b/projects/tp0.rc
index 41a996650..9188b05af 100755
--- a/projects/tp0.rc
+++ b/projects/tp0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../exed/res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/tp0.vcproj b/projects/tp0.vcproj
index 558a2efec..09774968f 100755
--- a/projects/tp0.vcproj
+++ b/projects/tp0.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/vd0.rc b/projects/vd0.rc
index 41a996650..9188b05af 100755
--- a/projects/vd0.rc
+++ b/projects/vd0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../exed/res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/vd0.vcproj b/projects/vd0.vcproj
index d11bfeb67..9a9373a70 100755
--- a/projects/vd0.vcproj
+++ b/projects/vd0.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/vd1.rc b/projects/vd1.rc
index 41a996650..9188b05af 100755
--- a/projects/vd1.rc
+++ b/projects/vd1.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../exed/res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/vd1.vcproj b/projects/vd1.vcproj
index 47c659379..d02049b3e 100755
--- a/projects/vd1.vcproj
+++ b/projects/vd1.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ve0.rc b/projects/ve0.rc
index 7e931c0f4..f03108047 100755
--- a/projects/ve0.rc
+++ b/projects/ve0.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/ve0.vcproj b/projects/ve0.vcproj
index ffcd85d64..ca84ffc7a 100755
--- a/projects/ve0.vcproj
+++ b/projects/ve0.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -164,7 +164,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ve1.rc b/projects/ve1.rc
index 7e931c0f4..f03108047 100755
--- a/projects/ve1.rc
+++ b/projects/ve1.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/ve1.vcproj b/projects/ve1.vcproj
index 0668d673c..87aba1019 100755
--- a/projects/ve1.vcproj
+++ b/projects/ve1.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ve2.rc b/projects/ve2.rc
index 7e931c0f4..f03108047 100755
--- a/projects/ve2.rc
+++ b/projects/ve2.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/ve2.vcproj b/projects/ve2.vcproj
index c2abb150b..44f589779 100755
--- a/projects/ve2.vcproj
+++ b/projects/ve2.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ve3.rc b/projects/ve3.rc
index 7e931c0f4..f03108047 100755
--- a/projects/ve3.rc
+++ b/projects/ve3.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/ve3.vcproj b/projects/ve3.vcproj
index 1fb0da89e..12a165a49 100755
--- a/projects/ve3.vcproj
+++ b/projects/ve3.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ve4.rc b/projects/ve4.rc
index 7e931c0f4..f03108047 100755
--- a/projects/ve4.rc
+++ b/projects/ve4.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/ve4.vcproj b/projects/ve4.vcproj
index 7e7a83b1d..f6f074ff5 100755
--- a/projects/ve4.vcproj
+++ b/projects/ve4.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ve5.rc b/projects/ve5.rc
index 7e931c0f4..f03108047 100755
--- a/projects/ve5.rc
+++ b/projects/ve5.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/ve5.vcproj b/projects/ve5.vcproj
index 11d958f30..c415e5349 100755
--- a/projects/ve5.vcproj
+++ b/projects/ve5.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,7 +162,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ve6.rc b/projects/ve6.rc
index 7e931c0f4..f03108047 100755
--- a/projects/ve6.rc
+++ b/projects/ve6.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/ve6.vcproj b/projects/ve6.vcproj
index a650e693b..2e71d7377 100755
--- a/projects/ve6.vcproj
+++ b/projects/ve6.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ve7.rc b/projects/ve7.rc
index 7e931c0f4..f03108047 100755
--- a/projects/ve7.rc
+++ b/projects/ve7.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/ve7.vcproj b/projects/ve7.vcproj
index 26c2e7846..af8fc6d8e 100755
--- a/projects/ve7.vcproj
+++ b/projects/ve7.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/ve8.rc b/projects/ve8.rc
index 41a996650..9188b05af 100755
--- a/projects/ve8.rc
+++ b/projects/ve8.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../exed/res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/ve8.vcproj b/projects/ve8.vcproj
index 99f20c34c..b6c311c8a 100755
--- a/projects/ve8.vcproj
+++ b/projects/ve8.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/vesirio.rc b/projects/vesirio.rc
index 7e931c0f4..f03108047 100755
--- a/projects/vesirio.rc
+++ b/projects/vesirio.rc
@@ -1,4 +1,4 @@
 "9012"       ICON DISCARDABLE    "../res/exe.ico"
 
-rcinclude ../../wx280/include/wx/msw/wx.rc
+rcinclude ../../wx283/include/wx/msw/wx.rc
 
diff --git a/projects/vesirio.vcproj b/projects/vesirio.vcproj
index 431884858..98def6234 100755
--- a/projects/vesirio.vcproj
+++ b/projects/vesirio.vcproj
@@ -66,7 +66,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -163,7 +163,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1040"
-				AdditionalIncludeDirectories="..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/projects/xvaga.vcproj b/projects/xvaga.vcproj
index 1bf33cdb4..c5bc4f069 100755
--- a/projects/xvaga.vcproj
+++ b/projects/xvaga.vcproj
@@ -48,7 +48,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="4"
-				AdditionalIncludeDirectories="..\..\wx280\lib\vc_dll\msw;..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\lib\vc_dll\msw;..\..\wx283\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;XVAGADLL"
 				RuntimeLibrary="0"
 				PrecompiledHeaderFile=".\..\Release\Xvaga/xvaga.pch"
@@ -139,7 +139,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\wx280\lib\vc_dll\mswd;..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\lib\vc_dll\mswd;..\..\wx283\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;XVAGADLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -534,7 +534,7 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxbase28.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxbase28.lib"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -546,7 +546,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxbase28_odbc.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxbase28_odbc.lib"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -558,15 +558,15 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxbase28d.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxbase28d.lib"
 			>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxbase28d_odbc.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxbase28d_odbc.lib"
 			>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxmsw28_adv.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxmsw28_adv.lib"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -578,7 +578,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxmsw28_core.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxmsw28_core.lib"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -590,11 +590,11 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxmsw28d_adv.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxmsw28d_adv.lib"
 			>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxmsw28d_core.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxmsw28d_core.lib"
 			>
 		</File>
 	</Files>
diff --git a/projects/xvapp.vcproj b/projects/xvapp.vcproj
index dbc9b7d05..b424f0423 100755
--- a/projects/xvapp.vcproj
+++ b/projects/xvapp.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\wx280\lib\vc_dll\mswd,..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\lib\vc_dll\mswd,..\..\wx283\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -118,7 +118,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\wx280\lib\vc_dll\msw,..\..\wx280\include"
+				AdditionalIncludeDirectories="..\..\wx283\lib\vc_dll\msw,..\..\wx283\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -201,7 +201,7 @@
 			>
 		</Filter>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxbase28.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxbase28.lib"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -213,7 +213,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxbase28_odbc.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxbase28_odbc.lib"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -225,7 +225,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxbase28d.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxbase28d.lib"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -237,7 +237,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxbase28d_odbc.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxbase28d_odbc.lib"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -249,7 +249,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxmsw28_adv.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxmsw28_adv.lib"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -261,7 +261,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxmsw28_core.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxmsw28_core.lib"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -273,7 +273,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxmsw28d_adv.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxmsw28d_adv.lib"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -285,7 +285,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\wx280\lib\vc_dll\wxmsw28d_core.lib"
+			RelativePath="..\..\wx283\lib\vc_dll\wxmsw28d_core.lib"
 			>
 			<FileConfiguration
 				Name="Release|Win32"