X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/506e9b7ed2bee097fd3674061f6962e54bdea7bf..9e1da4827a0ec18f9766d664b9af12c25e3f71fb:/build/msw/wx_vc7_core.vcproj?ds=sidebyside

diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj
index 3b9c2e76ae..72822b633d 100644
--- a/build/msw/wx_vc7_core.vcproj
+++ b/build/msw/wx_vc7_core.vcproj
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <!--
 
-  This makefile was generated by
-  Bakefile 0.2.5 (http://www.bakefile.org)
+  This project was generated by
+  Bakefile 0.2.9 (http://www.bakefile.org)
   Do not modify, all changes will be overwritten!
 
 -->
@@ -17,27 +17,86 @@
 	</Platforms>
 	<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="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="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="TRUE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="3"
+				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="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\vc_lib\wxmsw29ud_core.lib"
+				SuppressStartupBanner="TRUE"/>
+			<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="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<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="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\lib\vc_lib"
+			IntermediateDirectory="vc_mswu\core"
+			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
 			CharacterSet="1">
 			<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="TRUE"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="3"
 				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"
@@ -45,19 +104,13 @@
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<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"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\lib\vc_dll"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb"
-				TargetMachine="1"/>
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\vc_lib\wxmsw29u_core.lib"
+				SuppressStartupBanner="TRUE"/>
 			<Tool
-				Name="VCMIDLTool"/>
+				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="VCPostBuildEventTool"/>
 			<Tool
@@ -66,9 +119,9 @@
 				Name="VCPreLinkEventTool"/>
 			<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="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@@ -81,18 +134,18 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</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">
 			<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="TRUE"
 				BasicRuntimeChecks="3"
@@ -101,10 +154,9 @@
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="3"
 				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"
@@ -112,19 +164,13 @@
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<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"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\lib\vc_dll"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb"
-				TargetMachine="1"/>
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_core.lib"
+				SuppressStartupBanner="TRUE"/>
 			<Tool
-				Name="VCMIDLTool"/>
+				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="VCPostBuildEventTool"/>
 			<Tool
@@ -133,9 +179,9 @@
 				Name="VCPreLinkEventTool"/>
 			<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="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@@ -148,27 +194,26 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</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">
 			<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="TRUE"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="3"
 				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"
@@ -176,19 +221,13 @@
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<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"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\lib\vc_dll"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb"
-				TargetMachine="1"/>
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\vc_lib\wxmswuniv29u_core.lib"
+				SuppressStartupBanner="TRUE"/>
 			<Tool
-				Name="VCMIDLTool"/>
+				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="VCPostBuildEventTool"/>
 			<Tool
@@ -197,9 +236,9 @@
 				Name="VCPreLinkEventTool"/>
 			<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="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@@ -223,7 +262,7 @@
 				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="TRUE"
 				BasicRuntimeChecks="3"
@@ -233,9 +272,8 @@
 				UsePrecompiledHeader="3"
 				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\wxmsw295ud_core_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -245,17 +283,19 @@
 			<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\wxmsw295ud_core_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_core.lib"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw295ud_core_vc_custom.pdb"
 				TargetMachine="1"/>
 			<Tool
-				Name="VCMIDLTool"/>
+				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="VCPostBuildEventTool"/>
 			<Tool
@@ -264,7 +304,7 @@
 				Name="VCPreLinkEventTool"/>
 			<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=wxmsw295ud_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"/>
 			<Tool
@@ -279,27 +319,26 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</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">
 			<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="TRUE"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="3"
 				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\wxmsw295u_core_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -307,11 +346,23 @@
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxmswuniv29u_core.lib"
-				SuppressStartupBanner="TRUE"/>
+				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\wxmsw295u_core_vc_custom.dll"
+				LinkIncremental="1"
+				ImportLibrary="..\..\lib\vc_dll\wxmsw29u_core.lib"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="..\..\lib\vc_dll"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw295u_core_vc_custom.pdb"
+				TargetMachine="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"/>
 			<Tool
-				Name="VCMIDLTool"/>
+				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="VCPostBuildEventTool"/>
 			<Tool
@@ -320,9 +371,9 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
+				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295u_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="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@@ -335,18 +386,18 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</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">
 			<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="TRUE"
 				BasicRuntimeChecks="3"
@@ -355,10 +406,9 @@
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="3"
 				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\wxmswuniv295ud_core_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -366,11 +416,21 @@
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_core.lib"
-				SuppressStartupBanner="TRUE"/>
+				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\wxmswuniv295ud_core_vc_custom.dll"
+				LinkIncremental="2"
+				ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_core.lib"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="..\..\lib\vc_dll"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv295ud_core_vc_custom.pdb"
+				TargetMachine="1"/>
 			<Tool
-				Name="VCMIDLTool"/>
+				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="VCPostBuildEventTool"/>
 			<Tool
@@ -379,9 +439,9 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv295ud_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="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@@ -394,27 +454,26 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</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">
 			<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="TRUE"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="3"
 				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\wxmswuniv295u_core_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -422,11 +481,23 @@
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxmsw29u_core.lib"
-				SuppressStartupBanner="TRUE"/>
+				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\wxmswuniv295u_core_vc_custom.dll"
+				LinkIncremental="1"
+				ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_core.lib"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="..\..\lib\vc_dll"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv295u_core_vc_custom.pdb"
+				TargetMachine="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"/>
 			<Tool
-				Name="VCMIDLTool"/>
+				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="VCPostBuildEventTool"/>
 			<Tool
@@ -435,68 +506,9 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
+				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv295u_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"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswud\core"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="1">
-			<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="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="TRUE"
-				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="3"
-				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="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxmsw29ud_core.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<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"/>
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@@ -522,6 +534,9 @@
 			<File
 				RelativePath="..\..\src\common\accesscmn.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\common\affinematrix2d.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\anidecod.cpp">
 			</File>
@@ -534,9 +549,15 @@
 			<File
 				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">
 			</File>
@@ -546,6 +567,12 @@
 			<File
 				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">
 			</File>
@@ -564,6 +591,9 @@
 			<File
 				RelativePath="..\..\src\common\colourcmn.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\common\colourdata.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\combocmn.cpp">
 			</File>
@@ -579,9 +609,6 @@
 			<File
 				RelativePath="..\..\src\common\ctrlsub.cpp">
 			</File>
-			<File
-				RelativePath="..\..\src\common\datacmn.cpp">
-			</File>
 			<File
 				RelativePath="..\..\src\common\dcbase.cpp">
 			</File>
@@ -594,6 +621,9 @@
 			<File
 				RelativePath="..\..\src\common\dcsvg.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\common\dirctrlcmn.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\dlgcmn.cpp">
 			</File>
@@ -618,49 +648,49 @@
 			<File
 				RelativePath="..\..\src\common\dummy.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32">
+					Name="Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="1"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32">
+					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="1"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Release|Win32">
+					Name="Universal Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="1"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Debug|Win32">
+					Name="Universal Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="1"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Release|Win32">
+					Name="DLL Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="1"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Debug|Win32">
+					Name="DLL Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="1"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="DLL Universal Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="1"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="DLL Universal Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="1"/>
@@ -678,6 +708,9 @@
 			<File
 				RelativePath="..\..\src\common\filectrlcmn.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\common\filehistorycmn.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\filepickercmn.cpp">
 			</File>
@@ -687,6 +720,9 @@
 			<File
 				RelativePath="..\..\src\common\fontcmn.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\common\fontdata.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\fontenumcmn.cpp">
 			</File>
@@ -723,6 +759,12 @@
 			<File
 				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">
 			</File>
@@ -777,12 +819,18 @@
 			<File
 				RelativePath="..\..\src\common\listctrlcmn.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\common\markupparser.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\matrix.cpp">
 			</File>
 			<File
 				RelativePath="..\..\src\common\menucmn.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\common\mousemanager.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\msgout.cpp">
 			</File>
@@ -792,9 +840,18 @@
 			<File
 				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">
 			</File>
@@ -807,27 +864,54 @@
 			<File
 				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">
 			</File>
 			<File
 				RelativePath="..\..\src\common\rgncmn.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\common\scrolbarcmn.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\settcmn.cpp">
 			</File>
 			<File
 				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">
 			</File>
 			<File
 				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">
 			</File>
@@ -843,12 +927,18 @@
 			<File
 				RelativePath="..\..\src\common\textentrycmn.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\common\textmeasurecmn.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\toplvcmn.cpp">
 			</File>
 			<File
 				RelativePath="..\..\src\common\treebase.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\common\uiactioncmn.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\utilscmn.cpp">
 			</File>
@@ -858,6 +948,9 @@
 			<File
 				RelativePath="..\..\src\common\validate.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\common\valnum.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\valtext.cpp">
 			</File>
@@ -880,32 +973,74 @@
 			<File
 				RelativePath="..\..\src\msw\accel.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_accel.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_accel.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|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="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\ole\access.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<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\ole\activex.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\msw\anybutton.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\app.cpp">
@@ -913,16 +1048,16 @@
 			<File
 				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
@@ -934,16 +1069,40 @@
 			<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"
+					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="Universal Debug|Win32"
+					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
@@ -952,16 +1111,40 @@
 			<File
 				RelativePath="..\..\src\msw\button.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_button.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					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="Universal Debug|Win32"
+					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
@@ -970,46 +1153,118 @@
 			<File
 				RelativePath="..\..\src\msw\checkbox.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_checkbox.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_checkbox.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|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="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\checklst.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_checklst.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_checklst.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\msw\choice.cpp">
+					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="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\choice.cpp">
 				<FileConfiguration
-					Name="DLL Universal Debug|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="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|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="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
@@ -1018,16 +1273,16 @@
 			<File
 				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>
 			<File
@@ -1036,46 +1291,94 @@
 			<File
 				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>
 			<File
 				RelativePath="..\..\src\msw\combobox.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_combobox.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_combobox.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|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="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\control.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_control.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_control.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|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="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
@@ -1105,16 +1408,40 @@
 			<File
 				RelativePath="..\..\src\msw\dialog.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_dialog.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_dialog.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|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="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
@@ -1126,16 +1453,16 @@
 			<File
 				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>
 			<File
@@ -1144,16 +1471,16 @@
 			<File
 				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>
 			<File
@@ -1171,31 +1498,55 @@
 			<File
 				RelativePath="..\..\src\msw\fdrepdlg.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_fdrepdlg.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_fdrepdlg.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|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="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
 				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>
 			<File
@@ -1204,16 +1555,16 @@
 			<File
 				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>
 			<File
@@ -1225,31 +1576,55 @@
 			<File
 				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>
 			<File
 				RelativePath="..\..\src\msw\gauge.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_gauge.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_gauge.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|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="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
@@ -1264,6 +1639,21 @@
 			<File
 				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">
 			</File>
@@ -1279,46 +1669,94 @@
 			<File
 				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>
 			<File
 				RelativePath="..\..\src\msw\listbox.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_listbox.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_listbox.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|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="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\listctrl.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_listctrl.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_listctrl.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|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="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
@@ -1327,61 +1765,85 @@
 			<File
 				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>
 			<File
 				RelativePath="..\..\src\msw\menu.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_menu.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_menu.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|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="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
 				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>
 			<File
 				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>
 			<File
@@ -1390,16 +1852,16 @@
 			<File
 				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>
 			<File
@@ -1408,46 +1870,73 @@
 			<File
 				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>
 			<File
 				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>
+			<File
+				RelativePath="..\..\src\msw\nonownedwnd.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\msw\notebook.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_notebook.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_notebook.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|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="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
@@ -1456,21 +1945,36 @@
 			<File
 				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>
 			<File
 				RelativePath="..\..\src\msw\palette.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\msw\panel.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\pen.cpp">
 			</File>
@@ -1484,1181 +1988,2177 @@
 				RelativePath="..\..\src\msw\printwin.cpp">
 			</File>
 			<File
-				RelativePath="..\..\src\msw\radiobox.cpp">
-				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
-				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
-				<FileConfiguration
-					Name="Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+				RelativePath="..\..\src\msw\progdlg.cpp">
 				<FileConfiguration
 					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\msw\radiobut.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<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>
 			<File
-				RelativePath="..\..\src\msw\region.cpp">
-			</File>
-			<File
-				RelativePath="..\..\src\msw\renderer.cpp">
-			</File>
-			<File
-				RelativePath="..\..\src\msw\scrolbar.cpp">
+				RelativePath="..\..\src\msw\radiobox.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_radiobox.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					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="Universal Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\msw\settings.cpp">
-			</File>
-			<File
-				RelativePath="..\..\src\msw\slider.cpp">
+					Name="DLL Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_radiobox.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					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="Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
-				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
-				RelativePath="..\..\src\msw\spinbutt.cpp">
+				RelativePath="..\..\src\msw\radiobut.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_radiobut.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					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="Universal Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\msw\spinctrl.cpp">
+					Name="DLL Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_radiobut.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					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="Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
-				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
-				RelativePath="..\..\src\msw\statbmp.cpp">
+				RelativePath="..\..\src\msw\region.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\msw\renderer.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\msw\richmsgdlg.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\statbox.cpp">
+				RelativePath="..\..\src\msw\ole\safearray.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\msw\scrolbar.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_scrolbar.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_scrolbar.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\msw\statline.cpp">
+					Name="DLL Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_scrolbar.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					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 Release|Win32"
-					ExcludedFromBuild="TRUE"/>
-				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
-				RelativePath="..\..\src\msw\stattext.cpp">
+				RelativePath="..\..\src\msw\settings.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\msw\slider.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_slider.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_slider.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\msw\statusbar.cpp">
+					Name="DLL Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_slider.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					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 Release|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\spinbutt.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_spinbutt.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_spinbutt.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Universal Release|Win32"
 					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_spinbutt.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					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 Release|Win32"
-					ExcludedFromBuild="TRUE"/>
-				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
-				RelativePath="..\..\src\msw\textentry.cpp">
+				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>
 			<File
-				RelativePath="..\..\src\msw\tglbtn.cpp">
+				RelativePath="..\..\src\msw\statbmp.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_statbmp.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_statbmp.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\msw\toolbar.cpp">
+					Name="DLL Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_statbmp.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					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 Release|Win32"
-					ExcludedFromBuild="TRUE"/>
-				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
-				RelativePath="..\..\src\msw\tooltip.cpp">
-			</File>
-			<File
-				RelativePath="..\..\src\msw\toplevel.cpp">
-			</File>
-			<File
-				RelativePath="..\..\src\msw\treectrl.cpp">
-				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+				RelativePath="..\..\src\msw\statbox.cpp">
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_statbox.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_statbox.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\msw\utilsgui.cpp">
-			</File>
-			<File
-				RelativePath="..\..\src\msw\ole\uuid.cpp">
-			</File>
-			<File
-				RelativePath="..\..\src\msw\uxtheme.cpp">
-			</File>
-			<File
-				RelativePath="..\..\src\msw\version.rc">
 				<FileConfiguration
 					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="DLL Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_statbox.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					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="Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
-				RelativePath="..\..\src\msw\volume.cpp">
-			</File>
-			<File
-				RelativePath="..\..\src\msw\window.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Generic Sources"
-			UniqueIdentifier="{FEA0C02F-F300-53BA-B784-52A5086B8093}">
-			<File
-				RelativePath="..\..\src\generic\accel.cpp">
+				RelativePath="..\..\src\msw\statline.cpp">
 				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_statline.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_statline.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\generic\busyinfo.cpp">
-			</File>
-			<File
-				RelativePath="..\..\src\generic\buttonbar.cpp">
-			</File>
-			<File
-				RelativePath="..\..\src\generic\choicbkg.cpp">
-			</File>
-			<File
-				RelativePath="..\..\src\generic\choicdgg.cpp">
-			</File>
-			<File
-				RelativePath="..\..\src\generic\clrpickerg.cpp">
-			</File>
-			<File
-				RelativePath="..\..\src\generic\collpaneg.cpp">
-			</File>
-			<File
-				RelativePath="..\..\src\generic\colrdlgg.cpp">
 				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="DLL Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_statline.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="DLL Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_statline.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
-				RelativePath="..\..\src\generic\combog.cpp">
-			</File>
-			<File
-				RelativePath="..\..\src\generic\dcpsg.cpp">
-			</File>
-			<File
-				RelativePath="..\..\src\generic\dirctrlg.cpp">
-			</File>
-			<File
-				RelativePath="..\..\src\generic\dirdlgg.cpp">
+				RelativePath="..\..\src\msw\stattext.cpp">
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					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"/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_stattext.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					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="Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
-				RelativePath="..\..\src\generic\dragimgg.cpp">
-			</File>
-			<File
-				RelativePath="..\..\src\generic\fdrepdlg.cpp">
+				RelativePath="..\..\src\msw\statusbar.cpp">
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
-				RelativePath="..\..\src\generic\filectrlg.cpp">
-			</File>
-			<File
-				RelativePath="..\..\src\generic\filedlgg.cpp">
+				RelativePath="..\..\src\msw\textctrl.cpp">
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_textctrl.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_textctrl.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_textctrl.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					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="Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
-				RelativePath="..\..\src\generic\filepickerg.cpp">
-			</File>
-			<File
-				RelativePath="..\..\src\generic\fontdlgg.cpp">
+				RelativePath="..\..\src\msw\textentry.cpp">
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
-				RelativePath="..\..\src\generic\fontpickerg.cpp">
-			</File>
-			<File
-				RelativePath="..\..\src\generic\listbkg.cpp">
+				RelativePath="..\..\src\msw\textmeasure.cpp">
 			</File>
 			<File
-				RelativePath="..\..\src\generic\listctrl.cpp">
+				RelativePath="..\..\src\msw\tglbtn.cpp">
 				<FileConfiguration
-					Name="DLL 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 Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="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="Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
-				RelativePath="..\..\src\generic\logg.cpp">
-			</File>
-			<File
-				RelativePath="..\..\src\generic\mdig.cpp">
+				RelativePath="..\..\src\msw\toolbar.cpp">
 				<FileConfiguration
-					Name="DLL 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 Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="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="Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
-				RelativePath="..\..\src\generic\msgdlgg.cpp">
+				RelativePath="..\..\src\msw\tooltip.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\msw\toplevel.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\msw\treectrl.cpp">
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
-				RelativePath="..\..\src\generic\numdlgg.cpp">
-			</File>
-			<File
-				RelativePath="..\..\src\generic\panelg.cpp">
-			</File>
-			<File
-				RelativePath="..\..\src\generic\printps.cpp">
+				RelativePath="..\..\src\msw\uiaction.cpp">
 			</File>
 			<File
-				RelativePath="..\..\src\generic\prntdlgg.cpp">
+				RelativePath="..\..\src\msw\utilsgui.cpp">
 			</File>
 			<File
-				RelativePath="..\..\src\generic\progdlgg.cpp">
+				RelativePath="..\..\src\msw\utilswin.cpp">
 			</File>
 			<File
-				RelativePath="..\..\src\generic\renderg.cpp">
+				RelativePath="..\..\src\msw\ole\uuid.cpp">
 			</File>
 			<File
-				RelativePath="..\..\src\generic\scrlwing.cpp">
+				RelativePath="..\..\src\msw\uxtheme.cpp">
 			</File>
 			<File
-				RelativePath="..\..\src\generic\selstore.cpp">
+				RelativePath="..\..\src\msw\version.rc">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
-				RelativePath="..\..\src\generic\spinctlg.cpp">
+				RelativePath="..\..\src\msw\volume.cpp">
 			</File>
 			<File
-				RelativePath="..\..\src\generic\splitter.cpp">
+				RelativePath="..\..\src\msw\window.cpp">
 			</File>
+		</Filter>
+		<Filter
+			Name="Generic Sources"
+			UniqueIdentifier="{FEA0C02F-F300-53BA-B784-52A5086B8093}">
 			<File
-				RelativePath="..\..\src\generic\srchctlg.cpp">
+				RelativePath="..\..\src\generic\accel.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\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="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\statbmpg.cpp">
+				RelativePath="..\..\src\generic\busyinfo.cpp">
 			</File>
 			<File
-				RelativePath="..\..\src\generic\stattextg.cpp">
+				RelativePath="..\..\src\generic\buttonbar.cpp">
 			</File>
 			<File
-				RelativePath="..\..\src\generic\statusbr.cpp">
+				RelativePath="..\..\src\generic\choicbkg.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\generic\choicdgg.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\generic\clrpickerg.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\generic\collpaneg.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\generic\colrdlgg.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
-				RelativePath="..\..\src\generic\tabg.cpp">
+				RelativePath="..\..\src\generic\combog.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\generic\dcpsg.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\generic\dirctrlg.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\generic\dirdlgg.cpp">
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+			</File>
+			<File
+				RelativePath="..\..\src\generic\dragimgg.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\generic\fdrepdlg.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\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="DLL Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					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">
+			</File>
+			<File
+				RelativePath="..\..\src\generic\filedlgg.cpp">
 				<FileConfiguration
 					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Release|Win32"
+					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
-				RelativePath="..\..\src\generic\textdlgg.cpp">
+				RelativePath="..\..\src\generic\filepickerg.cpp">
 			</File>
 			<File
-				RelativePath="..\..\src\generic\tipwin.cpp">
+				RelativePath="..\..\src\generic\fontdlgg.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Release|Win32"
+					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
-				RelativePath="..\..\src\generic\toolbkg.cpp">
+				RelativePath="..\..\src\generic\fontpickerg.cpp">
 			</File>
 			<File
-				RelativePath="..\..\src\generic\treebkg.cpp">
+				RelativePath="..\..\src\generic\graphicc.cpp">
 			</File>
 			<File
-				RelativePath="..\..\src\generic\treectlg.cpp">
+				RelativePath="..\..\src\generic\headerctrlg.cpp">
 			</File>
 			<File
-				RelativePath="..\..\src\generic\vlbox.cpp">
+				RelativePath="..\..\src\generic\infobar.cpp">
 			</File>
 			<File
-				RelativePath="..\..\src\generic\vscroll.cpp">
+				RelativePath="..\..\src\generic\listbkg.cpp">
 			</File>
-		</Filter>
-		<Filter
-			Name="wxUniv Sources"
-			UniqueIdentifier="{6F354595-5EA6-5848-AAA1-6C4820DE7AEE}">
 			<File
-				RelativePath="..\..\src\univ\bmpbuttn.cpp">
+				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\univ\button.cpp">
+				RelativePath="..\..\src\generic\logg.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\generic\markuptext.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\generic\mdig.cpp">
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+			</File>
+			<File
+				RelativePath="..\..\src\generic\msgdlgg.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\generic\numdlgg.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\generic\printps.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\generic\prntdlgg.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\generic\progdlgg.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\generic\renderg.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\generic\richmsgdlgg.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\generic\scrlwing.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\generic\selstore.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\generic\spinctlg.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\generic\splitter.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\generic\srchctlg.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\generic\statbmpg.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\generic\stattextg.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\generic\statusbr.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\generic_statusbr.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\generic_statusbr.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\generic_statusbr.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					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="DLL Universal Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+			</File>
+			<File
+				RelativePath="..\..\src\generic\textdlgg.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\generic\tipwin.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\generic\toolbkg.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\generic\treebkg.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\generic\treectlg.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\generic\vlbox.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\generic\vscroll.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="wxUniv Sources"
+			UniqueIdentifier="{6F354595-5EA6-5848-AAA1-6C4820DE7AEE}">
+			<File
+				RelativePath="..\..\src\univ\bmpbuttn.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_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="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="DLL Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					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\checklst.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_checklst.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_checklst.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_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="Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					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="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="Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					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="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="Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					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="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="Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+			</File>
+			<File
+				RelativePath="..\..\src\univ\dialog.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_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="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="Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\checkbox.cpp">
 				<FileConfiguration
 					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
+			</File>
+			<File
+				RelativePath="..\..\src\univ\gauge.cpp">
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Release|Win32"
 					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_gauge.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					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\choice.cpp">
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+				RelativePath="..\..\src\univ\themes\gtk.cpp">
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\combobox.cpp">
 				<FileConfiguration
 					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
+			</File>
+			<File
+				RelativePath="..\..\src\univ\inpcons.cpp">
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\control.cpp">
 				<FileConfiguration
 					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
+			</File>
+			<File
+				RelativePath="..\..\src\univ\inphand.cpp">
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\ctrlrend.cpp">
 				<FileConfiguration
 					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
+			</File>
+			<File
+				RelativePath="..\..\src\univ\listbox.cpp">
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\dialog.cpp">
+					Name="Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_listbox.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_listbox.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_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\framuniv.cpp">
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+				RelativePath="..\..\src\univ\menu.cpp">
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\gauge.cpp">
+					Name="Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_menu.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_menu.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_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\gtk.cpp">
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+				RelativePath="..\..\src\univ\themes\metal.cpp">
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\inpcons.cpp">
 				<FileConfiguration
 					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
+			</File>
+			<File
+				RelativePath="..\..\src\univ\themes\mono.cpp">
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\inphand.cpp">
 				<FileConfiguration
 					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
+			</File>
+			<File
+				RelativePath="..\..\src\univ\notebook.cpp">
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|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"/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\listbox.cpp">
 				<FileConfiguration
 					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					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="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|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"/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\menu.cpp">
 				<FileConfiguration
 					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					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="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|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"/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\themes\metal.cpp">
 				<FileConfiguration
 					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					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="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\themes\mono.cpp">
 				<FileConfiguration
 					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
+			</File>
+			<File
+				RelativePath="..\..\src\univ\scrolbar.cpp">
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\notebook.cpp">
+					Name="Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_scrolbar.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					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\radiobox.cpp">
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+				RelativePath="..\..\src\univ\scrthumb.cpp">
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\radiobut.cpp">
 				<FileConfiguration
 					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
+			</File>
+			<File
+				RelativePath="..\..\src\univ\settingsuniv.cpp">
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\scrarrow.cpp">
 				<FileConfiguration
 					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
+			</File>
+			<File
+				RelativePath="..\..\src\univ\slider.cpp">
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\scrolbar.cpp">
+					Name="Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_slider.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_slider.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_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\scrthumb.cpp">
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+				RelativePath="..\..\src\univ\spinbutt.cpp">
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\settingsuniv.cpp">
+					Name="Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_spinbutt.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_spinbutt.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_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\slider.cpp">
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+				RelativePath="..\..\src\univ\statbmp.cpp">
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\spinbutt.cpp">
+					Name="Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_statbmp.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_statbmp.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_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\statbmp.cpp">
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+				RelativePath="..\..\src\univ\statbox.cpp">
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\statbox.cpp">
+					Name="Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_statbox.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_statbox.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_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="Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					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="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					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="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\statusbr.cpp">
+					Name="Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_statusbr.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_statusbr.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_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>
 			<File
 				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>
 			<File
 				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>
 			<File
 				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>
 			<File
 				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>
 		</Filter>
@@ -2668,96 +4168,88 @@
 			<File
 				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"
-						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
+						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"/>
 				</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"
-						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
+						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"/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Universal Release|Win32"/>
 				<FileConfiguration
 					Name="Universal Debug|Win32"/>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Universal Release|Win32"/>
+				<FileConfiguration
+					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"
-						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
+						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"/>
 				</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"
-						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
+						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"/>
 				</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"
-						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
+						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"/>
 				</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"
-						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
+						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"/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Release|Win32"/>
 				<FileConfiguration
 					Name="DLL Debug|Win32"/>
 				<FileConfiguration
-					Name="Universal Release|Win32">
+					Name="DLL Release|Win32"/>
+				<FileConfiguration
+					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"
-						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
+						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"/>
 				</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"
-						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
+						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"/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"/>
-				<FileConfiguration
-					Name="Debug|Win32"/>
 			</File>
 		</Filter>
 		<Filter
@@ -2772,6 +4264,9 @@
 			<File
 				RelativePath="..\..\include\wx\msw\ole\activex.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\anybutton.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\app.h">
 			</File>
@@ -2823,6 +4318,9 @@
 			<File
 				RelativePath="..\..\include\wx\msw\combobox.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\commandlinkbutton.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\control.h">
 			</File>
@@ -2832,6 +4330,9 @@
 			<File
 				RelativePath="..\..\include\wx\msw\cursor.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\custombgwin.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\ole\dataform.h">
 			</File>
@@ -2842,10 +4343,10 @@
 				RelativePath="..\..\include\wx\msw\ole\dataobj2.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\datecontrols.h">
+				RelativePath="..\..\include\wx\msw\datectrl.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\datectrl.h">
+				RelativePath="..\..\include\wx\msw\datetimectrl.h">
 			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\dc.h">
@@ -2910,40 +4411,31 @@
 			<File
 				RelativePath="..\..\include\wx\msw\genrcdefs.h">
 				<FileConfiguration
-					Name="DLL Universal Release|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;"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Universal Debug|Win32">
+					Name="Debug|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\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 Release|Win32">
+					Name="Release|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\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 Debug|Win32">
+					Name="Universal Debug|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\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="Universal Release|Win32">
@@ -2955,36 +4447,48 @@
 						AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivu\wx\msw&quot;"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Debug|Win32">
+					Name="DLL Debug|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\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="Release|Win32">
+					Name="DLL Release|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\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="Debug|Win32">
+					Name="DLL Universal Debug|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\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="DLL Universal Release|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;"/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\glcanvas.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\headerctrl.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\helpbest.h">
 			</File>
@@ -2997,6 +4501,9 @@
 			<File
 				RelativePath="..\..\include\wx\msw\htmlhelp.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\hyperlink.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\icon.h">
 			</File>
@@ -3006,6 +4513,9 @@
 			<File
 				RelativePath="..\..\include\wx\msw\iniconf.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\init.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\joystick.h">
 			</File>
@@ -3039,6 +4549,9 @@
 			<File
 				RelativePath="..\..\include\wx\msw\msvcrt.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\nonownedwnd.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\notebook.h">
 			</File>
@@ -3048,9 +4561,15 @@
 			<File
 				RelativePath="..\..\include\wx\msw\ole\oleutils.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\ownerdrw.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\palette.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\panel.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\pen.h">
 			</File>
@@ -3063,6 +4582,9 @@
 			<File
 				RelativePath="..\..\include\wx\msw\printwin.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\progdlg.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\radiobox.h">
 			</File>
@@ -3076,10 +4598,13 @@
 				RelativePath="..\..\include\wx\msw\region.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\scrolbar.h">
+				RelativePath="..\..\include\wx\msw\richmsgdlg.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\ole\safearray.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\setup0.h">
+				RelativePath="..\..\include\wx\msw\scrolbar.h">
 			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\slider.h">
@@ -3108,9 +4633,6 @@
 			<File
 				RelativePath="..\..\include\wx\msw\statusbar.h">
 			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\tabctrl.h">
-			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\taskbar.h">
 			</File>
@@ -3123,6 +4645,9 @@
 			<File
 				RelativePath="..\..\include\wx\msw\tglbtn.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\timectrl.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\toolbar.h">
 			</File>
@@ -3144,6 +4669,15 @@
 			<File
 				RelativePath="..\..\include\wx\msw\uxthemep.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\webview_ie.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\webview_missing.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\webviewhistoryitem_ie.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\window.h">
 			</File>
@@ -3190,6 +4724,9 @@
 			<File
 				RelativePath="..\..\include\wx\generic\ctrlsub.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\custombgwin.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\dataview.h">
 			</File>
@@ -3208,6 +4745,12 @@
 			<File
 				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">
 			</File>
@@ -3232,15 +4775,24 @@
 			<File
 				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">
 			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\hyperlink.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\infobar.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\laywin.h">
 			</File>
@@ -3280,6 +4832,9 @@
 			<File
 				RelativePath="..\..\include\wx\generic\propdlg.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\richmsgdlgg.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\sashwin.h">
 			</File>
@@ -3308,10 +4863,10 @@
 				RelativePath="..\..\include\wx\generic\statusbr.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\generic\tabg.h">
+				RelativePath="..\..\include\wx\generic\textdlgg.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\generic\textdlgg.h">
+				RelativePath="..\..\include\wx\generic\timectrl.h">
 			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\treectlg.h">
@@ -3323,6 +4878,9 @@
 		<Filter
 			Name="wxUniv Headers"
 			UniqueIdentifier="{46168D7C-2783-50F3-AE9D-A740D5FF0B44}">
+			<File
+				RelativePath="..\..\include\wx\univ\anybutton.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\univ\app.h">
 			</File>
@@ -3353,6 +4911,9 @@
 			<File
 				RelativePath="..\..\include\wx\univ\control.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\univ\custombgwin.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\univ\dialog.h">
 			</File>
@@ -3380,6 +4941,9 @@
 			<File
 				RelativePath="..\..\include\wx\univ\notebook.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\univ\panel.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\univ\radiobox.h">
 			</File>
@@ -3489,6 +5053,9 @@
 			<File
 				RelativePath="..\..\include\wx\html\m_templ.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\html\styleparams.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\html\winpars.h">
 			</File>
@@ -3508,6 +5075,12 @@
 			<File
 				RelativePath="..\..\include\wx\propgrid\advprops.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\affinematrix2d.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\affinematrix2dbase.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\anidecod.h">
 			</File>
@@ -3517,6 +5090,15 @@
 			<File
 				RelativePath="..\..\include\wx\animdecod.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\anybutton.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">
 			</File>
@@ -3529,6 +5111,12 @@
 			<File
 				RelativePath="..\..\include\wx\aui\auibook.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\bannerwindow.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\ribbon\bar.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\bitmap.h">
 			</File>
@@ -3541,6 +5129,9 @@
 			<File
 				RelativePath="..\..\include\wx\bookctrl.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\persist\bookctrl.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\brush.h">
 			</File>
@@ -3550,6 +5141,9 @@
 			<File
 				RelativePath="..\..\include\wx\button.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\ribbon\buttonbar.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\cairo.h">
 			</File>
@@ -3595,15 +5189,27 @@
 			<File
 				RelativePath="..\..\include\wx\colour.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\colourdata.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\combo.h">
 			</File>
 			<File
 				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">
 			</File>
@@ -3613,6 +5219,9 @@
 			<File
 				RelativePath="..\..\include\wx\cursor.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\custombgwin.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\dataobj.h">
 			</File>
@@ -3625,6 +5234,9 @@
 			<File
 				RelativePath="..\..\include\wx\dateevt.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\datetimectrl.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\dc.h">
 			</File>
@@ -3691,6 +5303,9 @@
 			<File
 				RelativePath="..\..\include\wx\dragimag.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\dvrenderers.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\editlbox.h">
 			</File>
@@ -3704,7 +5319,7 @@
 				RelativePath="..\..\include\wx\encinfo.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\evtloop.h">
+				RelativePath="..\..\include\wx\evtloopsrc.h">
 			</File>
 			<File
 				RelativePath="..\..\include\wx\fdrepdlg.h">
@@ -3715,6 +5330,9 @@
 			<File
 				RelativePath="..\..\include\wx\filedlg.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\filehistory.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\filepicker.h">
 			</File>
@@ -3727,6 +5345,9 @@
 			<File
 				RelativePath="..\..\include\wx\font.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\fontdata.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\fontdlg.h">
 			</File>
@@ -3745,6 +5366,9 @@
 			<File
 				RelativePath="..\..\include\wx\aui\framemanager.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\ribbon\gallery.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\gauge.h">
 			</File>
@@ -3772,6 +5396,12 @@
 			<File
 				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">
 			</File>
@@ -3832,6 +5462,12 @@
 			<File
 				RelativePath="..\..\include\wx\imagxpm.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\infobar.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\itemid.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\joystick.h">
 			</File>
@@ -3877,6 +5513,9 @@
 			<File
 				RelativePath="..\..\include\wx\minifram.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\mousemanager.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msgdlg.h">
 			</File>
@@ -3904,18 +5543,27 @@
 			<File
 				RelativePath="..\..\include\wx\ownerdrw.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\ribbon\page.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\palette.h">
 			</File>
 			<File
 				RelativePath="..\..\include\wx\panel.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\ribbon\panel.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\paper.h">
 			</File>
 			<File
 				RelativePath="..\..\include\wx\pen.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\persist.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\pickerbase.h">
 			</File>
@@ -3967,42 +5615,93 @@
 			<File
 				RelativePath="..\..\include\wx\radiobut.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\range.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\rawbmp.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\rearrangectrl.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\region.h">
 			</File>
 			<File
 				RelativePath="..\..\include\wx\renderer.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\richmsgdlg.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\richtext\richtextbackgroundpage.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\richtext\richtextborderspage.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\richtext\richtextbuffer.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\richtext\richtextbulletspage.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\richtext\richtextctrl.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\richtext\richtextdialogpage.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\richtext\richtextfontpage.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\richtext\richtextformatdlg.h">
 			</File>
 			<File
 				RelativePath="..\..\include\wx\richtext\richtexthtml.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\richtext\richtextimagedlg.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\richtext\richtextindentspage.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\richtext\richtextliststylepage.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\richtext\richtextmarginspage.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\richtext\richtextprint.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\richtext\richtextsizepage.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\richtext\richtextstyledlg.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\richtext\richtextstylepage.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\richtext\richtextstyles.h">
 			</File>
 			<File
 				RelativePath="..\..\include\wx\richtext\richtextsymboldlg.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\richtext\richtexttabspage.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\richtext\richtextuicustomization.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\richtext\richtextxml.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\richtooltip.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\sashwin.h">
 			</File>
@@ -4021,6 +5720,9 @@
 			<File
 				RelativePath="..\..\include\wx\settings.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\simplebook.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\sizer.h">
 			</File>
@@ -4039,6 +5741,9 @@
 			<File
 				RelativePath="..\..\include\wx\splash.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\persist\splitter.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\splitter.h">
 			</File>
@@ -4064,10 +5769,7 @@
 				RelativePath="..\..\include\wx\stc\stc.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\tab.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\tabctrl.h">
+				RelativePath="..\..\include\wx\aui\tabart.h">
 			</File>
 			<File
 				RelativePath="..\..\include\wx\aui\tabmdi.h">
@@ -4078,6 +5780,9 @@
 			<File
 				RelativePath="..\..\include\wx\tbarbase.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\textcompleter.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\textctrl.h">
 			</File>
@@ -4087,9 +5792,15 @@
 			<File
 				RelativePath="..\..\include\wx\textentry.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\textwrapper.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\tglbtn.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\timectrl.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\tipdlg.h">
 			</File>
@@ -4097,7 +5808,7 @@
 				RelativePath="..\..\include\wx\tipwin.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\tls.h">
+				RelativePath="..\..\include\wx\ribbon\toolbar.h">
 			</File>
 			<File
 				RelativePath="..\..\include\wx\toolbar.h">
@@ -4108,24 +5819,39 @@
 			<File
 				RelativePath="..\..\include\wx\tooltip.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\persist\toplevel.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\toplevel.h">
 			</File>
 			<File
 				RelativePath="..\..\include\wx\treebase.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\persist\treebook.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\treebook.h">
 			</File>
 			<File
 				RelativePath="..\..\include\wx\treectrl.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\treelist.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\uiaction.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\valgen.h">
 			</File>
 			<File
 				RelativePath="..\..\include\wx\validate.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\valnum.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\valtext.h">
 			</File>
@@ -4141,12 +5867,27 @@
 			<File
 				RelativePath="..\..\include\wx\vscroll.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\webview.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\webviewarchivehandler.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\webviewfshandler.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\persist\window.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\window.h">
 			</File>
 			<File
 				RelativePath="..\..\include\wx\windowid.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\withimages.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\wizard.h">
 			</File>
@@ -4165,6 +5906,12 @@
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_animatctrl.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_auinotbk.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_bannerwindow.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_bmp.h">
 			</File>
@@ -4195,12 +5942,18 @@
 			<File
 				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">
 			</File>
 			<File
 				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">
 			</File>
@@ -4210,6 +5963,12 @@
 			<File
 				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">
 			</File>
@@ -4270,6 +6029,12 @@
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_radbx.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_ribbon.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_richtext.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_scrol.h">
 			</File>
@@ -4312,9 +6077,15 @@
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_tglbtn.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_timectrl.h">
+			</File>
 			<File
 				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">
 			</File>
@@ -4330,6 +6101,9 @@
 			<File
 				RelativePath="..\..\include\wx\xrc\xmlres.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xmlreshandler.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xpmdecod.h">
 			</File>
@@ -4337,6 +6111,14 @@
 				RelativePath="..\..\include\wx\xpmhand.h">
 			</File>
 		</Filter>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath="..\..\src\xrc\xmlreshandler.cpp">
+			</File>
+		</Filter>
 	</Files>
 	<Globals>