X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f7ca1dd4164eff38df31c21b975e9707f97bd266..6e91eb1f761a1d9bfb0cccc2141fd61a8b978a36:/build/msw/wx_vc8_core.vcproj?ds=sidebyside

diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj
index 07517be147..5a922dcc46 100644
--- a/build/msw/wx_vc8_core.vcproj
+++ b/build/msw/wx_vc8_core.vcproj
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <!--
 
-  This makefile was generated by
-  Bakefile 0.2.4 (http://www.bakefile.org)
+  This project was generated by
+  Bakefile 0.2.8 (http://www.bakefile.org)
   Do not modify, all changes will be overwritten!
 
 -->
@@ -22,10 +22,95 @@
 	</ToolFiles>
 	<Configurations>
 		<Configuration
-			Name="DLL Universal Release|Win32"
-			OutputDirectory="..\..\lib\vc_dll"
-			IntermediateDirectory="vc_mswunivudll\core"
-			ConfigurationType="2"
+			Name="Debug|Win32"
+			OutputDirectory="..\..\lib\vc_lib"
+			IntermediateDirectory="vc_mswud\core"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
+				MinimalRebuild="true"
+				ExceptionHandling="1"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="wx/wxprec.h"
+				PrecompiledHeaderFile="vc_mswud\wxprec_corelib.pch"
+				ObjectFile="vc_mswud\core\"
+				ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_core.pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\vc_lib\wxmsw29ud_core.lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_core.bsc"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\lib\vc_lib"
+			IntermediateDirectory="vc_mswu\core"
+			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="1"
@@ -44,21 +129,22 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+				PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0"
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswunivudll\wxprec_coredll.pch"
-				AssemblerListingLocation="vc_mswunivudll\core\"
-				ObjectFile="vc_mswunivudll\core\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb"
+				PrecompiledHeaderFile="vc_mswu\wxprec_corelib.pch"
+				ObjectFile="vc_mswu\core\"
+				ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_core.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -69,26 +155,17 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions=""
-				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase29u.lib"
-				OutputFile="..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.dll"
-				LinkIncremental="2"
-				ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_core.lib"
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\vc_lib\wxmsw29u_core.lib"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\lib\vc_dll"
-				GenerateManifest="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb"
-				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -101,7 +178,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_vc8_core.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_core.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -112,10 +189,10 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="DLL Universal Debug|Win32"
-			OutputDirectory="..\..\lib\vc_dll"
-			IntermediateDirectory="vc_mswunivuddll\core"
-			ConfigurationType="2"
+			Name="Universal Debug|Win32"
+			OutputDirectory="..\..\lib\vc_lib"
+			IntermediateDirectory="vc_mswunivud\core"
+			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="1"
@@ -134,12 +211,14 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
 				MinimalRebuild="true"
 				ExceptionHandling="1"
 				BasicRuntimeChecks="3"
@@ -148,10 +227,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswunivuddll\wxprec_coredll.pch"
-				AssemblerListingLocation="vc_mswunivuddll\core\"
-				ObjectFile="vc_mswunivuddll\core\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb"
+				PrecompiledHeaderFile="vc_mswunivud\wxprec_corelib.pch"
+				ObjectFile="vc_mswunivud\core\"
+				ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_core.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -162,26 +240,17 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions=""
-				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase29ud.lib"
-				OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.dll"
-				LinkIncremental="2"
-				ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_core.lib"
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_core.lib"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\lib\vc_dll"
-				GenerateManifest="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb"
-				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -194,7 +263,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_vc8_core.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_core.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -205,10 +274,10 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="DLL Release|Win32"
-			OutputDirectory="..\..\lib\vc_dll"
-			IntermediateDirectory="vc_mswudll\core"
-			ConfigurationType="2"
+			Name="Universal Release|Win32"
+			OutputDirectory="..\..\lib\vc_lib"
+			IntermediateDirectory="vc_mswunivu\core"
+			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="1"
@@ -227,21 +296,22 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+				PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0"
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswudll\wxprec_coredll.pch"
-				AssemblerListingLocation="vc_mswudll\core\"
-				ObjectFile="vc_mswudll\core\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb"
+				PrecompiledHeaderFile="vc_mswunivu\wxprec_corelib.pch"
+				ObjectFile="vc_mswunivu\core\"
+				ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_core.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -252,26 +322,17 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions=""
-				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase29u.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw290u_core_vc_custom.dll"
-				LinkIncremental="2"
-				ImportLibrary="..\..\lib\vc_dll\wxmsw29u_core.lib"
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\vc_lib\wxmswuniv29u_core.lib"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\lib\vc_dll"
-				GenerateManifest="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb"
-				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -284,7 +345,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_vc8_core.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_core.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -317,12 +378,14 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
 				MinimalRebuild="true"
 				ExceptionHandling="1"
 				BasicRuntimeChecks="3"
@@ -332,9 +395,8 @@
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_coredll.pch"
-				AssemblerListingLocation="vc_mswuddll\core\"
 				ObjectFile="vc_mswuddll\core\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw292ud_core_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -345,7 +407,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw292ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
 			/>
@@ -355,15 +417,15 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase29ud.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.dll"
+				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib"
+				OutputFile="..\..\lib\vc_dll\wxmsw292ud_core_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_core.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292ud_core_vc_custom.pdb"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -388,10 +450,10 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Universal Release|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswunivu\core"
-			ConfigurationType="4"
+			Name="DLL Release|Win32"
+			OutputDirectory="..\..\lib\vc_dll"
+			IntermediateDirectory="vc_mswudll\core"
+			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="1"
@@ -410,21 +472,22 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswunivu\wxprec_corelib.pch"
-				AssemblerListingLocation="vc_mswunivu\core\"
-				ObjectFile="vc_mswunivu\core\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_core.pdb"
+				PrecompiledHeaderFile="vc_mswudll\wxprec_coredll.pch"
+				ObjectFile="vc_mswudll\core\"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw292u_core_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -435,17 +498,28 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
+				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw292u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxmswuniv29u_core.lib"
+				Name="VCLinkerTool"
+				AdditionalOptions=""
+				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib"
+				OutputFile="..\..\lib\vc_dll\wxmsw292u_core_vc_custom.dll"
+				LinkIncremental="1"
+				ImportLibrary="..\..\lib\vc_dll\wxmsw29u_core.lib"
 				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\lib\vc_dll"
+				GenerateManifest="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292u_core_vc_custom.pdb"
+				TargetMachine="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -458,7 +532,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_vc8_core.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_core.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -469,10 +543,10 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Universal Debug|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswunivud\core"
-			ConfigurationType="4"
+			Name="DLL Universal Debug|Win32"
+			OutputDirectory="..\..\lib\vc_dll"
+			IntermediateDirectory="vc_mswunivuddll\core"
+			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="1"
@@ -491,12 +565,14 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
 				MinimalRebuild="true"
 				ExceptionHandling="1"
 				BasicRuntimeChecks="3"
@@ -505,10 +581,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswunivud\wxprec_corelib.pch"
-				AssemblerListingLocation="vc_mswunivud\core\"
-				ObjectFile="vc_mswunivud\core\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_core.pdb"
+				PrecompiledHeaderFile="vc_mswunivuddll\wxprec_coredll.pch"
+				ObjectFile="vc_mswunivuddll\core\"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv292ud_core_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -519,17 +594,26 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv292ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_core.lib"
+				Name="VCLinkerTool"
+				AdditionalOptions=""
+				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib"
+				OutputFile="..\..\lib\vc_dll\wxmswuniv292ud_core_vc_custom.dll"
+				LinkIncremental="2"
+				ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_core.lib"
 				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\lib\vc_dll"
+				GenerateManifest="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292ud_core_vc_custom.pdb"
+				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -542,7 +626,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_vc8_core.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_core.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -553,10 +637,10 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswu\core"
-			ConfigurationType="4"
+			Name="DLL Universal Release|Win32"
+			OutputDirectory="..\..\lib\vc_dll"
+			IntermediateDirectory="vc_mswunivudll\core"
+			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="1"
@@ -575,21 +659,22 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswu\wxprec_corelib.pch"
-				AssemblerListingLocation="vc_mswu\core\"
-				ObjectFile="vc_mswu\core\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_core.pdb"
+				PrecompiledHeaderFile="vc_mswunivudll\wxprec_coredll.pch"
+				ObjectFile="vc_mswunivudll\core\"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv292u_core_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -600,101 +685,28 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
+				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv292u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxmsw29u_core.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_vc8_core.bsc"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswud\core"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswud\wxprec_corelib.pch"
-				AssemblerListingLocation="vc_mswud\core\"
-				ObjectFile="vc_mswud\core\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_core.pdb"
-				WarningLevel="4"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxmsw29ud_core.lib"
+				Name="VCLinkerTool"
+				AdditionalOptions=""
+				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib"
+				OutputFile="..\..\lib\vc_dll\wxmswuniv292u_core_vc_custom.dll"
+				LinkIncremental="1"
+				ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_core.lib"
 				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\lib\vc_dll"
+				GenerateManifest="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292u_core_vc_custom.pdb"
+				TargetMachine="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -707,7 +719,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_vc8_core.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_core.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -750,10 +762,18 @@
 				RelativePath="..\..\src\common\artstd.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\common\arttango.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\bmpbase.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\common\bmpbtncmn.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\bookctrl.cpp"
 				>
@@ -766,6 +786,14 @@
 				RelativePath="..\..\src\common\cairo.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\common\checkboxcmn.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\common\checklstcmn.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\choiccmn.cpp"
 				>
@@ -790,6 +818,10 @@
 				RelativePath="..\..\src\common\colourcmn.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\common\colourdata.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\combocmn.cpp"
 				>
@@ -810,10 +842,6 @@
 				RelativePath="..\..\src\common\ctrlsub.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\common\datacmn.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\common\dcbase.cpp"
 				>
@@ -830,6 +858,10 @@
 				RelativePath="..\..\src\common\dcsvg.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\common\dirctrlcmn.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\dlgcmn.cpp"
 				>
@@ -862,7 +894,7 @@
 				RelativePath="..\..\src\common\dummy.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -870,7 +902,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -878,7 +910,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Universal Debug|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -886,7 +918,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Universal Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -894,7 +926,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Debug|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -902,7 +934,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -910,7 +942,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -918,7 +950,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -942,6 +974,10 @@
 				RelativePath="..\..\src\common\filectrlcmn.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\common\filehistorycmn.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\filepickercmn.cpp"
 				>
@@ -954,6 +990,10 @@
 				RelativePath="..\..\src\common\fontcmn.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\common\fontdata.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\fontenumcmn.cpp"
 				>
@@ -1002,6 +1042,14 @@
 				RelativePath="..\..\src\common\graphcmn.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\common\headercolcmn.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\common\headerctrlcmn.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\helpbase.cpp"
 				>
@@ -1082,6 +1130,10 @@
 				RelativePath="..\..\src\common\menucmn.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\common\mousemanager.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\msgout.cpp"
 				>
@@ -1094,10 +1146,22 @@
 				RelativePath="..\..\src\common\overlaycmn.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\common\ownerdrwcmn.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\common\panelcmn.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\paper.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\common\persist.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\pickerbase.cpp"
 				>
@@ -1114,10 +1178,18 @@
 				RelativePath="..\..\src\common\quantize.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\common\radiobtncmn.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\radiocmn.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\common\rearrangectrl.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\rendcmn.cpp"
 				>
@@ -1126,6 +1198,10 @@
 				RelativePath="..\..\src\common\rgncmn.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\common\scrolbarcmn.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\settcmn.cpp"
 				>
@@ -1134,6 +1210,18 @@
 				RelativePath="..\..\src\common\sizer.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\common\slidercmn.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\common\spinbtncmn.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\common\spinctrlcmn.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\srchcmn.cpp"
 				>
@@ -1142,6 +1230,18 @@
 				RelativePath="..\..\src\common\statbar.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\common\statbmpcmn.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\common\statboxcmn.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\common\statlinecmn.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\stattextcmn.cpp"
 				>
@@ -1170,6 +1270,10 @@
 				RelativePath="..\..\src\common\treebase.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\common\uiactioncmn.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\utilscmn.cpp"
 				>
@@ -1211,19 +1315,51 @@
 				RelativePath="..\..\src\msw\accel.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_accel.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_accel.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_accel.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_accel.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -1231,77 +1367,165 @@
 				RelativePath="..\..\src\msw\ole\access.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
 			<File
-				RelativePath="..\..\src\msw\app.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\msw\ole\automtn.cpp"
+				RelativePath="..\..\src\msw\ole\activex.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\msw\bitmap.cpp"
+				RelativePath="..\..\src\msw\app.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\msw\bmpbuttn.cpp"
+				RelativePath="..\..\src\msw\artmsw.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
 			<File
-				RelativePath="..\..\src\msw\brush.cpp"
+				RelativePath="..\..\src\msw\ole\automtn.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\msw\button.cpp"
+				RelativePath="..\..\src\msw\bitmap.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\bmpbuttn.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="true"
-				/>
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_bmpbuttn.obj"
+					/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
-					ExcludedFromBuild="true"
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_bmpbuttn.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
+					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
 					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_bmpbuttn.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_bmpbuttn.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="true"
+				/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					ExcludedFromBuild="true"
+				/>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\brush.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\button.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_button.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_button.obj"
+					/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					ExcludedFromBuild="true"
+				/>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_button.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_button.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="true"
+				/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					ExcludedFromBuild="true"
+				/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\caret.cpp"
@@ -1311,19 +1535,51 @@
 				RelativePath="..\..\src\msw\checkbox.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_checkbox.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_checkbox.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_checkbox.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_checkbox.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -1331,19 +1587,51 @@
 				RelativePath="..\..\src\msw\checklst.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_checklst.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_checklst.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_checklst.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_checklst.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -1351,19 +1639,51 @@
 				RelativePath="..\..\src\msw\choice.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_choice.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_choice.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_choice.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_choice.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -1375,19 +1695,19 @@
 				RelativePath="..\..\src\msw\colordlg.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -1399,19 +1719,19 @@
 				RelativePath="..\..\src\msw\combo.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -1419,19 +1739,51 @@
 				RelativePath="..\..\src\msw\combobox.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_combobox.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_combobox.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_combobox.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_combobox.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -1439,19 +1791,51 @@
 				RelativePath="..\..\src\msw\control.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_control.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_control.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_control.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_control.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -1491,19 +1875,51 @@
 				RelativePath="..\..\src\msw\dialog.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_dialog.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_dialog.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_dialog.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_dialog.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -1519,19 +1935,19 @@
 				RelativePath="..\..\src\msw\dirdlg.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -1543,19 +1959,19 @@
 				RelativePath="..\..\src\msw\dragimag.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -1579,19 +1995,51 @@
 				RelativePath="..\..\src\msw\fdrepdlg.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_fdrepdlg.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_fdrepdlg.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_fdrepdlg.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_fdrepdlg.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -1599,19 +2047,19 @@
 				RelativePath="..\..\src\msw\filedlg.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -1623,19 +2071,19 @@
 				RelativePath="..\..\src\msw\fontdlg.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -1651,19 +2099,19 @@
 				RelativePath="..\..\src\msw\frame.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -1671,19 +2119,51 @@
 				RelativePath="..\..\src\msw\gauge.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_gauge.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_gauge.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_gauge.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_gauge.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -1703,6 +2183,26 @@
 				RelativePath="..\..\src\msw\graphics.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\msw\headerctrl.cpp"
+				>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
+					ExcludedFromBuild="true"
+				/>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					ExcludedFromBuild="true"
+				/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="true"
+				/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					ExcludedFromBuild="true"
+				/>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\helpchm.cpp"
 				>
@@ -1723,19 +2223,19 @@
 				RelativePath="..\..\src\msw\iniconf.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -1743,19 +2243,51 @@
 				RelativePath="..\..\src\msw\listbox.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_listbox.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_listbox.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_listbox.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_listbox.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -1763,19 +2295,51 @@
 				RelativePath="..\..\src\msw\listctrl.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_listctrl.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_listctrl.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_listctrl.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_listctrl.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -1787,19 +2351,19 @@
 				RelativePath="..\..\src\msw\mdi.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -1807,19 +2371,51 @@
 				RelativePath="..\..\src\msw\menu.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_menu.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_menu.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_menu.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_menu.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -1827,19 +2423,19 @@
 				RelativePath="..\..\src\msw\menuitem.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -1847,19 +2443,19 @@
 				RelativePath="..\..\src\msw\metafile.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -1871,19 +2467,19 @@
 				RelativePath="..\..\src\msw\msgdlg.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -1895,19 +2491,19 @@
 				RelativePath="..\..\src\msw\nativdlg.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -1915,19 +2511,19 @@
 				RelativePath="..\..\src\msw\nativewin.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -1935,19 +2531,51 @@
 				RelativePath="..\..\src\msw\notebook.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_notebook.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_notebook.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_notebook.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_notebook.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -1959,19 +2587,19 @@
 				RelativePath="..\..\src\msw\ownerdrw.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -1996,10 +2624,14 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\msw\radiobox.cpp"
+				RelativePath="..\..\src\msw\progdlg.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Universal Debug|Win32"
+					ExcludedFromBuild="true"
+				/>
+				<FileConfiguration
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
@@ -2007,59 +2639,191 @@
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\radiobox.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_radiobox.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_radiobox.obj"
+					/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					ExcludedFromBuild="true"
+				/>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_radiobox.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_radiobox.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="true"
+				/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					ExcludedFromBuild="true"
+				/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\radiobut.cpp"
 				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_radiobut.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_radiobut.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
+					ExcludedFromBuild="true"
+				/>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					ExcludedFromBuild="true"
+				/>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_radiobut.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_radiobut.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="true"
+				/>
 				<FileConfiguration
 					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\region.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\renderer.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\richmsgdlg.cpp"
+				>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
+					ExcludedFromBuild="true"
+				/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
-			<File
-				RelativePath="..\..\src\msw\region.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\msw\renderer.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\msw\scrolbar.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_scrolbar.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_scrolbar.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_scrolbar.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_scrolbar.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -2071,19 +2835,51 @@
 				RelativePath="..\..\src\msw\slider.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_slider.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_slider.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_slider.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_slider.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -2091,19 +2887,51 @@
 				RelativePath="..\..\src\msw\spinbutt.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_spinbutt.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_spinbutt.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_spinbutt.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_spinbutt.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -2111,19 +2939,19 @@
 				RelativePath="..\..\src\msw\spinctrl.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -2131,19 +2959,51 @@
 				RelativePath="..\..\src\msw\statbmp.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_statbmp.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_statbmp.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_statbmp.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_statbmp.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -2151,19 +3011,51 @@
 				RelativePath="..\..\src\msw\statbox.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_statbox.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_statbox.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_statbox.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_statbox.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -2171,39 +3063,103 @@
 				RelativePath="..\..\src\msw\statline.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_statline.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_statline.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
+					ExcludedFromBuild="true"
+				/>
+				<FileConfiguration
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_statline.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_statline.obj"
+					/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\stattext.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_stattext.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_stattext.obj"
+					/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
-			</File>
-			<File
-				RelativePath="..\..\src\msw\stattext.cpp"
-				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
+					Name="DLL Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_stattext.obj"
+					/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_stattext.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -2211,31 +3167,43 @@
 				RelativePath="..\..\src\msw\statusbar.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
 			<File
-				RelativePath="..\..\src\msw\tabctrl.cpp"
+				RelativePath="..\..\src\msw\textctrl.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="true"
-				/>
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_textctrl.obj"
+					/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_textctrl.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
@@ -2243,27 +3211,27 @@
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-			</File>
-			<File
-				RelativePath="..\..\src\msw\textctrl.cpp"
-				>
+					Name="DLL Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_textctrl.obj"
+					/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="true"
-				/>
+					Name="DLL Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_textctrl.obj"
+					/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -2271,19 +3239,19 @@
 				RelativePath="..\..\src\msw\textentry.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -2291,19 +3259,51 @@
 				RelativePath="..\..\src\msw\tglbtn.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_tglbtn.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_tglbtn.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_tglbtn.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_tglbtn.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -2311,19 +3311,51 @@
 				RelativePath="..\..\src\msw\toolbar.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_toolbar.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_toolbar.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_toolbar.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_toolbar.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -2339,7 +3371,11 @@
 				RelativePath="..\..\src\msw\treectrl.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Universal Debug|Win32"
+					ExcludedFromBuild="true"
+				/>
+				<FileConfiguration
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
@@ -2347,13 +3383,29 @@
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\uiaction.cpp"
+				>
 				<FileConfiguration
 					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					ExcludedFromBuild="true"
+				/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="true"
+				/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					ExcludedFromBuild="true"
+				/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\utilsgui.cpp"
@@ -2371,19 +3423,19 @@
 				RelativePath="..\..\src\msw\version.rc"
 				>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -2404,21 +3456,53 @@
 				RelativePath="..\..\src\generic\accel.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\generic_accel.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\generic_accel.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="true"
 				/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\generic_accel.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\generic_accel.obj"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\generic\busyinfo.cpp"
@@ -2448,19 +3532,19 @@
 				RelativePath="..\..\src\generic\colrdlgg.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -2480,19 +3564,19 @@
 				RelativePath="..\..\src\generic\dirdlgg.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -2504,21 +3588,53 @@
 				RelativePath="..\..\src\generic\fdrepdlg.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				/>
+				<FileConfiguration
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 				/>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\generic_fdrepdlg.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\generic_fdrepdlg.obj"
+					/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="DLL Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
+					Name="DLL Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\generic_fdrepdlg.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\generic_fdrepdlg.obj"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\generic\filectrlg.cpp"
@@ -2528,19 +3644,19 @@
 				RelativePath="..\..\src\generic\filedlgg.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -2552,19 +3668,19 @@
 				RelativePath="..\..\src\generic\fontdlgg.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -2572,6 +3688,18 @@
 				RelativePath="..\..\src\generic\fontpickerg.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\generic\graphicc.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\generic\headerctrlg.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\generic\infobar.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\generic\listbkg.cpp"
 				>
@@ -2580,21 +3708,53 @@
 				RelativePath="..\..\src\generic\listctrl.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\generic_listctrl.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\generic_listctrl.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="true"
 				/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\generic_listctrl.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\generic_listctrl.obj"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\generic\logg.cpp"
@@ -2604,41 +3764,25 @@
 				RelativePath="..\..\src\generic\mdig.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
 			<File
 				RelativePath="..\..\src\generic\msgdlgg.cpp"
 				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\generic\numdlgg.cpp"
@@ -2664,6 +3808,10 @@
 				RelativePath="..\..\src\generic\renderg.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\generic\richmsgdlgg.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\generic\scrlwing.cpp"
 				>
@@ -2696,39 +3844,51 @@
 				RelativePath="..\..\src\generic\statusbr.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\generic_statusbr.obj"
+					/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Release|Win32"
-					ExcludedFromBuild="true"
-				/>
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\generic_statusbr.obj"
+					/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
-			</File>
-			<File
-				RelativePath="..\..\src\generic\tabg.cpp"
-				>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
 					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\generic_statusbr.obj"
+					/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\generic_statusbr.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -2769,51 +3929,163 @@
 				RelativePath="..\..\src\univ\bmpbuttn.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_bmpbuttn.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_bmpbuttn.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="true"
 				/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\univ_bmpbuttn.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\univ_bmpbuttn.obj"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\univ\button.cpp"
 				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				/>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				/>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_button.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_button.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
+					ExcludedFromBuild="true"
+				/>
 				<FileConfiguration
 					Name="DLL Release|Win32"
 					ExcludedFromBuild="true"
 				/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\univ_button.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\univ_button.obj"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\univ\checkbox.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				/>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				/>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_checkbox.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_checkbox.obj"
+					/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="DLL Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
+					Name="DLL Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\univ_checkbox.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\univ_checkbox.obj"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\src\univ\checkbox.cpp"
+				RelativePath="..\..\src\univ\checklst.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
@@ -2821,107 +4093,219 @@
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\checklst.cpp"
-				>
+					Name="Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_checklst.obj"
+					/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
+					Name="Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_checklst.obj"
+					/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="DLL Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
+					Name="DLL Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\univ_checklst.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\univ_checklst.obj"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\univ\choice.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_choice.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_choice.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="true"
 				/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\univ_choice.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\univ_choice.obj"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\univ\combobox.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_combobox.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_combobox.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="true"
 				/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\univ_combobox.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\univ_combobox.obj"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\univ\control.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_control.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_control.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="true"
 				/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\univ_control.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\univ_control.obj"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\univ\ctrlrend.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -2929,39 +4313,71 @@
 				RelativePath="..\..\src\univ\dialog.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_dialog.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_dialog.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="true"
 				/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\univ_dialog.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\univ_dialog.obj"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\univ\framuniv.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -2969,39 +4385,71 @@
 				RelativePath="..\..\src\univ\gauge.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				/>
+				<FileConfiguration
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 				/>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_gauge.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_gauge.obj"
+					/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="DLL Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
+					Name="DLL Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\univ_gauge.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\univ_gauge.obj"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\univ\themes\gtk.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -3009,19 +4457,19 @@
 				RelativePath="..\..\src\univ\inpcons.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -3029,19 +4477,19 @@
 				RelativePath="..\..\src\univ\inphand.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -3049,59 +4497,123 @@
 				RelativePath="..\..\src\univ\listbox.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_listbox.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_listbox.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="true"
 				/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\univ_listbox.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\univ_listbox.obj"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\univ\menu.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_menu.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_menu.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="true"
 				/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\univ_menu.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\univ_menu.obj"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\univ\themes\metal.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -3109,19 +4621,19 @@
 				RelativePath="..\..\src\univ\themes\mono.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -3129,79 +4641,175 @@
 				RelativePath="..\..\src\univ\notebook.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_notebook.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_notebook.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="true"
 				/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\univ_notebook.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\univ_notebook.obj"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\univ\radiobox.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_radiobox.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_radiobox.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="true"
 				/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\univ_radiobox.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\univ_radiobox.obj"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\univ\radiobut.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_radiobut.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_radiobut.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="true"
 				/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\univ_radiobut.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\univ_radiobut.obj"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\univ\scrarrow.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -3209,39 +4817,71 @@
 				RelativePath="..\..\src\univ\scrolbar.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				/>
+				<FileConfiguration
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 				/>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_scrolbar.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_scrolbar.obj"
+					/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="DLL Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
+					Name="DLL Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\univ_scrolbar.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\univ_scrolbar.obj"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\univ\scrthumb.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -3249,19 +4889,19 @@
 				RelativePath="..\..\src\univ\settingsuniv.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -3269,159 +4909,383 @@
 				RelativePath="..\..\src\univ\slider.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_slider.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_slider.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="true"
 				/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\univ_slider.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\univ_slider.obj"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\univ\spinbutt.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_spinbutt.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_spinbutt.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="true"
 				/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\univ_spinbutt.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\univ_spinbutt.obj"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\univ\statbmp.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_statbmp.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_statbmp.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="true"
 				/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\univ_statbmp.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\univ_statbmp.obj"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\univ\statbox.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_statbox.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_statbox.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="true"
 				/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\univ_statbox.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\univ_statbox.obj"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\univ\statline.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_statline.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_statline.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="true"
 				/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\univ_statline.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\univ_statline.obj"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\univ\stattext.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_stattext.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_stattext.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="true"
 				/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\univ_stattext.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\univ_stattext.obj"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\univ\statusbr.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_statusbr.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_statusbr.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="true"
 				/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\univ_statusbr.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\univ_statusbr.obj"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\univ\stdrend.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -3429,59 +5293,123 @@
 				RelativePath="..\..\src\univ\textctrl.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_textctrl.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_textctrl.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="true"
 				/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\univ_textctrl.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\univ_textctrl.obj"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\univ\tglbtn.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_tglbtn.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_tglbtn.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="true"
 				/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\univ_tglbtn.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\univ_tglbtn.obj"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\univ\theme.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -3489,39 +5417,71 @@
 				RelativePath="..\..\src\univ\toolbar.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_toolbar.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_toolbar.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="true"
 				/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\univ_toolbar.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\univ_toolbar.obj"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\univ\topluniv.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -3529,19 +5489,19 @@
 				RelativePath="..\..\src\univ\themes\win32.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -3549,19 +5509,19 @@
 				RelativePath="..\..\src\univ\winuniv.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="true"
 				/>
 			</File>
@@ -3574,121 +5534,121 @@
 				RelativePath="..\..\include\wx\msw\setup.h"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-				/>
-				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
-				/>
-				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswu\wx\setup.h"
-						Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"
+						Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswud\wx\setup.h"
+						Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"
 						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswud\wx\setup.h"
-						Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"
+						Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswu\wx\setup.h"
+						Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"
 						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="Universal Debug|Win32"
 				/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="Universal Release|Win32"
 				/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswu\wx\setup.h"
-						Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"
+						Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h"
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswud\wx\setup.h"
+						Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"
 						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswud\wx\setup.h"
-						Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"
+						Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h"
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswu\wx\setup.h"
+						Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"
 						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+				/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+				/>
 			</File>
 			<File
 				RelativePath="..\..\include\wx\univ\setup.h"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Debug|Win32"
+				/>
+				<FileConfiguration
+					Name="Release|Win32"
+				/>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivu\wx\setup.h"
-						Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"
+						Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h"
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivud\wx\setup.h"
+						Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"
 						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivud\wx\setup.h"
-						Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"
+						Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h"
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivu\wx\setup.h"
+						Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"
 						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="DLL Debug|Win32"
 				/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="DLL Release|Win32"
 				/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivu\wx\setup.h"
-						Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"
+						Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h"
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivud\wx\setup.h"
+						Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"
 						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivud\wx\setup.h"
-						Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"
+						Description="Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h"
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivu\wx\setup.h"
+						Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"
 						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-				/>
 			</File>
 		</Filter>
 		<Filter
@@ -3775,6 +5735,10 @@
 				RelativePath="..\..\include\wx\msw\combobox.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\commandlinkbutton.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\control.h"
 				>
@@ -3799,10 +5763,6 @@
 				RelativePath="..\..\include\wx\msw\ole\dataobj2.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\datecontrols.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\datectrl.h"
 				>
@@ -3891,91 +5851,91 @@
 				RelativePath="..\..\include\wx\msw\genrcdefs.h"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
-						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h&quot;"
-						Outputs="..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
-						AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivu\wx\msw&quot;"
+						Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
+						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;"
+						Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
+						AdditionalDependencies="&quot;..\..\lib\vc_lib\mswud\wx\msw&quot;"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
-						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h&quot;"
-						Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
-						AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivud\wx\msw&quot;"
+						Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
+						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h&quot;"
+						Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
+						AdditionalDependencies="&quot;..\..\lib\vc_lib\mswu\wx\msw&quot;"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Universal Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
-						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h&quot;"
-						Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
-						AdditionalDependencies="&quot;..\..\lib\vc_dll\mswu\wx\msw&quot;"
+						Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
+						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h&quot;"
+						Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
+						AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivud\wx\msw&quot;"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Universal Release|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
-						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h&quot;"
-						Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
-						AdditionalDependencies="&quot;..\..\lib\vc_dll\mswud\wx\msw&quot;"
+						Description="Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
+						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h&quot;"
+						Outputs="..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
+						AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivu\wx\msw&quot;"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
-						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h&quot;"
-						Outputs="..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
-						AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivu\wx\msw&quot;"
+						Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
+						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h&quot;"
+						Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
+						AdditionalDependencies="&quot;..\..\lib\vc_dll\mswud\wx\msw&quot;"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Release|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
-						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h&quot;"
-						Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
-						AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivud\wx\msw&quot;"
+						Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
+						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h&quot;"
+						Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
+						AdditionalDependencies="&quot;..\..\lib\vc_dll\mswu\wx\msw&quot;"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
-						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h&quot;"
-						Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
-						AdditionalDependencies="&quot;..\..\lib\vc_lib\mswu\wx\msw&quot;"
+						Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
+						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h&quot;"
+						Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
+						AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivud\wx\msw&quot;"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
-						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;"
-						Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
-						AdditionalDependencies="&quot;..\..\lib\vc_lib\mswud\wx\msw&quot;"
+						Description="Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
+						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h&quot;"
+						Outputs="..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
+						AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivu\wx\msw&quot;"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3983,6 +5943,10 @@
 				RelativePath="..\..\include\wx\msw\glcanvas.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\headerctrl.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\helpbest.h"
 				>
@@ -3999,6 +5963,10 @@
 				RelativePath="..\..\include\wx\msw\htmlhelp.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\hyperlink.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\icon.h"
 				>
@@ -4067,6 +6035,10 @@
 				RelativePath="..\..\include\wx\msw\ole\oleutils.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\ownerdrw.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\palette.h"
 				>
@@ -4087,6 +6059,10 @@
 				RelativePath="..\..\include\wx\msw\printwin.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\progdlg.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\radiobox.h"
 				>
@@ -4103,6 +6079,10 @@
 				RelativePath="..\..\include\wx\msw\region.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\richmsgdlg.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\scrolbar.h"
 				>
@@ -4147,10 +6127,6 @@
 				RelativePath="..\..\include\wx\msw\statusbar.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\tabctrl.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\taskbar.h"
 				>
@@ -4280,6 +6256,14 @@
 				RelativePath="..\..\include\wx\generic\dragimgg.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\dvrenderer.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\dvrenderers.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\fdrepdlg.h"
 				>
@@ -4312,10 +6296,18 @@
 				RelativePath="..\..\include\wx\generic\gridctrl.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\grideditors.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\gridsel.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\headerctrlg.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\helpext.h"
 				>
@@ -4324,6 +6316,10 @@
 				RelativePath="..\..\include\wx\generic\hyperlink.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\infobar.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\laywin.h"
 				>
@@ -4376,6 +6372,10 @@
 				RelativePath="..\..\include\wx\generic\propdlg.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\richmsgdlgg.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\sashwin.h"
 				>
@@ -4412,10 +6412,6 @@
 				RelativePath="..\..\include\wx\generic\statusbr.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\tabg.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\textdlgg.h"
 				>
@@ -4654,6 +6650,10 @@
 				RelativePath="..\..\include\wx\html\m_templ.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\html\styleparams.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\html\winpars.h"
 				>
@@ -4691,6 +6691,14 @@
 				RelativePath="..\..\include\wx\animdecod.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\ribbon\art.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\ribbon\art_internal.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\artprov.h"
 				>
@@ -4707,6 +6715,10 @@
 				RelativePath="..\..\include\wx\aui\auibook.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\ribbon\bar.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\bitmap.h"
 				>
@@ -4719,6 +6731,10 @@
 				RelativePath="..\..\include\wx\bmpcbox.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\persist\bookctrl.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\bookctrl.h"
 				>
@@ -4735,6 +6751,10 @@
 				RelativePath="..\..\include\wx\button.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\ribbon\buttonbar.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\cairo.h"
 				>
@@ -4795,6 +6815,10 @@
 				RelativePath="..\..\include\wx\colour.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\colourdata.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\combo.h"
 				>
@@ -4803,10 +6827,22 @@
 				RelativePath="..\..\include\wx\combobox.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\commandlinkbutton.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\compositewin.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\control.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\ribbon\control.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\cshelp.h"
 				>
@@ -4923,6 +6959,10 @@
 				RelativePath="..\..\include\wx\dragimag.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\dvrenderers.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\editlbox.h"
 				>
@@ -4940,7 +6980,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\wx\evtloop.h"
+				RelativePath="..\..\include\wx\evtloopsrc.h"
 				>
 			</File>
 			<File
@@ -4955,6 +6995,10 @@
 				RelativePath="..\..\include\wx\filedlg.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\filehistory.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\filepicker.h"
 				>
@@ -4971,6 +7015,10 @@
 				RelativePath="..\..\include\wx\font.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\fontdata.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\fontdlg.h"
 				>
@@ -4995,6 +7043,10 @@
 				RelativePath="..\..\include\wx\aui\framemanager.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\ribbon\gallery.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\gauge.h"
 				>
@@ -5031,6 +7083,14 @@
 				RelativePath="..\..\include\wx\grid.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\headercol.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\headerctrl.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\help.h"
 				>
@@ -5111,6 +7171,10 @@
 				RelativePath="..\..\include\wx\imagxpm.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\infobar.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\joystick.h"
 				>
@@ -5171,6 +7235,10 @@
 				RelativePath="..\..\include\wx\minifram.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\mousemanager.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msgdlg.h"
 				>
@@ -5207,6 +7275,10 @@
 				RelativePath="..\..\include\wx\ownerdrw.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\ribbon\page.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\palette.h"
 				>
@@ -5215,6 +7287,10 @@
 				RelativePath="..\..\include\wx\panel.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\ribbon\panel.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\paper.h"
 				>
@@ -5223,6 +7299,10 @@
 				RelativePath="..\..\include\wx\pen.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\persist.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\pickerbase.h"
 				>
@@ -5295,6 +7375,10 @@
 				RelativePath="..\..\include\wx\rawbmp.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\rearrangectrl.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\region.h"
 				>
@@ -5303,6 +7387,10 @@
 				RelativePath="..\..\include\wx\renderer.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\richmsgdlg.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\richtext\richtextbuffer.h"
 				>
@@ -5319,6 +7407,10 @@
 				RelativePath="..\..\include\wx\richtext\richtexthtml.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\richtext\richtextimagedlg.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\richtext\richtextprint.h"
 				>
@@ -5419,14 +7511,6 @@
 				RelativePath="..\..\include\wx\stc\stc.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\include\wx\tab.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\tabctrl.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\include\wx\aui\tabmdi.h"
 				>
@@ -5451,6 +7535,10 @@
 				RelativePath="..\..\include\wx\textentry.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\textwrapper.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\tglbtn.h"
 				>
@@ -5464,7 +7552,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\wx\tls.h"
+				RelativePath="..\..\include\wx\ribbon\toolbar.h"
 				>
 			</File>
 			<File
@@ -5483,6 +7571,10 @@
 				RelativePath="..\..\include\wx\toplevel.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\persist\toplevel.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\treebase.h"
 				>
@@ -5491,10 +7583,18 @@
 				RelativePath="..\..\include\wx\treebook.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\persist\treebook.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\treectrl.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\uiaction.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\valgen.h"
 				>
@@ -5527,6 +7627,10 @@
 				RelativePath="..\..\include\wx\window.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\persist\window.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\windowid.h"
 				>
@@ -5595,6 +7699,10 @@
 				RelativePath="..\..\include\wx\xrc\xh_clrpicker.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_cmdlinkbn.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_collpane.h"
 				>
@@ -5603,6 +7711,10 @@
 				RelativePath="..\..\include\wx\xrc\xh_combo.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_comboctrl.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_datectrl.h"
 				>
@@ -5615,6 +7727,14 @@
 				RelativePath="..\..\include\wx\xrc\xh_dlg.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_editlbox.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_filectrl.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_filepicker.h"
 				>
@@ -5755,6 +7875,10 @@
 				RelativePath="..\..\include\wx\xrc\xh_toolb.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_toolbk.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_tree.h"
 				>