X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d2f3b08582317760addae3bf02f28bb42dc2bf70..2026acc1e228e2d0e23244796bce9aa16f7a4599:/build/msw/wx_vc8_core.vcproj

diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj
index 13612de558..18f1338e28 100644
--- a/build/msw/wx_vc8_core.vcproj
+++ b/build/msw/wx_vc8_core.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <!--
 
-  This makefile was generated by
-  Bakefile 0.2.3 (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!
 
 -->
@@ -22,101 +22,10 @@
 	</ToolFiles>
 	<Configurations>
 		<Configuration
-			Name="DLL Universal Release|Win32"
-			OutputDirectory="..\..\lib\vc_dll"
-			IntermediateDirectory="vc_mswunivudll\core"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				MinimalRebuild="false"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="2"
-				PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswunivudll\wxprec_coredll.pch"
-				AssemblerListingLocation="vc_mswunivudll\core\"
-				ObjectFile="vc_mswunivudll\core\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb"
-				WarningLevel="4"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				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"
-				AdditionalOptions=""
-				OutputFile="..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.dll"
-				LinkIncremental="2"
-				ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_core.lib"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\lib\vc_dll"
-				GenerateManifest="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_vc8_core.bsc"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="DLL Universal Debug|Win32"
-			OutputDirectory="..\..\lib\vc_dll"
-			IntermediateDirectory="vc_mswunivuddll\core"
-			ConfigurationType="2"
+			Name="Debug|Win32"
+			OutputDirectory="..\..\lib\vc_lib"
+			IntermediateDirectory="vc_mswud\core"
+			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="1"
@@ -134,66 +43,60 @@
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
 			<Tool
-				Name="VCIDLTool"
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
 				MinimalRebuild="true"
 				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="3"
-				PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
 				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswunivuddll\wxprec_coredll.pch"
-				AssemblerListingLocation="vc_mswunivuddll\core\"
-				ObjectFile="vc_mswunivuddll\core\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb"
+				PrecompiledHeaderFile="vc_mswud\wxprec_corelib.pch"
+				ObjectFile="vc_mswud\core\"
+				ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_core.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_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"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;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="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLinkerTool"
-				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"
-				AdditionalOptions=""
-				OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.dll"
-				LinkIncremental="2"
-				ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_core.lib"
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\vc_lib\wxmsw29ud_core.lib"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\lib\vc_dll"
-				GenerateManifest="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb"
-				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
 			<Tool
 				Name="VCXDCMakeTool"
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_vc8_core.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_core.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -204,10 +107,10 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="DLL Release|Win32"
-			OutputDirectory="..\..\lib\vc_dll"
-			IntermediateDirectory="vc_mswudll\core"
-			ConfigurationType="2"
+			Name="Release|Win32"
+			OutputDirectory="..\..\lib\vc_lib"
+			IntermediateDirectory="vc_mswu\core"
+			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="1"
@@ -225,66 +128,57 @@
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
 			<Tool
-				Name="VCIDLTool"
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				MinimalRebuild="false"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+				PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0"
 				ExceptionHandling="1"
-				AdditionalOptions=""
 				RuntimeLibrary="2"
-				PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswudll\wxprec_coredll.pch"
-				AssemblerListingLocation="vc_mswudll\core\"
-				ObjectFile="vc_mswudll\core\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb"
+				PrecompiledHeaderFile="vc_mswu\wxprec_corelib.pch"
+				ObjectFile="vc_mswu\core\"
+				ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_core.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;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"
-				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_core_vc_custom;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"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLinkerTool"
-				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"
-				AdditionalOptions=""
-				OutputFile="..\..\lib\vc_dll\wxmsw290u_core_vc_custom.dll"
-				LinkIncremental="2"
-				ImportLibrary="..\..\lib\vc_dll\wxmsw29u_core.lib"
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\vc_lib\wxmsw29u_core.lib"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\lib\vc_dll"
-				GenerateManifest="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb"
-				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
 			<Tool
 				Name="VCXDCMakeTool"
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_vc8_core.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_core.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -316,60 +210,63 @@
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
 			<Tool
-				Name="VCIDLTool"
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
 				MinimalRebuild="true"
 				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="3"
-				PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
 				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_coredll.pch"
-				AssemblerListingLocation="vc_mswuddll\core\"
 				ObjectFile="vc_mswuddll\core\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw295ud_core_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__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"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				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"
 				AdditionalOptions=""
-				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"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw295ud_core_vc_custom.pdb"
 				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
 			<Tool
 				Name="VCXDCMakeTool"
 			/>
@@ -386,10 +283,10 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Universal Release|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswunivu\core"
-			ConfigurationType="4"
+			Name="DLL Release|Win32"
+			OutputDirectory="..\..\lib\vc_dll"
+			IntermediateDirectory="vc_mswudll\core"
+			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="1"
@@ -407,303 +304,68 @@
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
 			<Tool
-				Name="VCIDLTool"
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				MinimalRebuild="false"
+				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;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
 				ExceptionHandling="1"
-				AdditionalOptions=""
 				RuntimeLibrary="2"
-				PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswunivu\wxprec_corelib.pch"
-				AssemblerListingLocation="vc_mswunivu\core\"
-				ObjectFile="vc_mswunivu\core\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_core.pdb"
+				PrecompiledHeaderFile="vc_mswudll\wxprec_coredll.pch"
+				ObjectFile="vc_mswudll\core\"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw295u_core_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__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"
-				PreprocessorDefinitions="__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"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxmswuniv29u_core.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_vc8_core.bsc"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Universal Debug|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswunivud\core"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
+				Name="VCLinkerTool"
 				AdditionalOptions=""
-				RuntimeLibrary="3"
-				PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswunivud\wxprec_corelib.pch"
-				AssemblerListingLocation="vc_mswunivud\core\"
-				ObjectFile="vc_mswunivud\core\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_core.pdb"
-				WarningLevel="4"
+				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"
+				GenerateManifest="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw295u_core_vc_custom.pdb"
+				TargetMachine="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
 			/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_core.lib"
-				SuppressStartupBanner="true"
+				Name="VCALinkTool"
 			/>
 			<Tool
-				Name="VCALinkTool"
+				Name="VCManifestTool"
 			/>
 			<Tool
 				Name="VCXDCMakeTool"
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_vc8_core.bsc"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswu\core"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				MinimalRebuild="false"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="2"
-				PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswu\wxprec_corelib.pch"
-				AssemblerListingLocation="vc_mswu\core\"
-				ObjectFile="vc_mswu\core\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_core.pdb"
-				WarningLevel="4"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxmsw29u_core.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_vc8_core.bsc"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswud\core"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="3"
-				PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswud\wxprec_corelib.pch"
-				AssemblerListingLocation="vc_mswud\core\"
-				ObjectFile="vc_mswud\core\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_core.pdb"
-				WarningLevel="4"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxmsw29ud_core.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_vc8_core.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_core.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -724,116 +386,165 @@
 			>
 			<File
 				RelativePath="..\..\src\common\accelcmn.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\accesscmn.cpp"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\common\affinematrix2d.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\anidecod.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\appcmn.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\artprov.cpp"
-			/>
+				>
+			</File>
 			<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>
 			<File
 				RelativePath="..\..\src\common\btncmn.cpp"
-			/>
+				>
+			</File>
 			<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>
 			<File
 				RelativePath="..\..\src\common\clipcmn.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\clrpickercmn.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\cmdproc.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\cmndata.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\colourcmn.cpp"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\common\colourdata.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\combocmn.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\containr.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\cshelp.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\ctrlcmn.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\ctrlsub.cpp"
-			/>
-			<File
-				RelativePath="..\..\src\common\datacmn.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\dcbase.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\dcbufcmn.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\dcgraph.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\dcsvg.cpp"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\common\dirctrlcmn.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\dlgcmn.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\dndcmn.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\dobjcmn.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\docmdi.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\docview.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\dpycmn.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\dseldlg.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\dummy.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -841,7 +552,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -857,31 +568,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Universal Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -891,211 +578,364 @@
 			</File>
 			<File
 				RelativePath="..\..\src\common\effects.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\event.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\fddlgcmn.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\filectrlcmn.cpp"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\common\filehistorycmn.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\filepickercmn.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\fldlgcmn.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\fontcmn.cpp"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\common\fontdata.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\fontenumcmn.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\fontmap.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\fontpickercmn.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\fontutilcmn.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\framecmn.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\fs_mem.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\gaugecmn.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\gbsizer.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\gdicmn.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\geometry.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\gifdecod.cpp"
-			/>
+				>
+			</File>
 			<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>
 			<File
 				RelativePath="..\..\src\common\iconbndl.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\imagall.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\imagbmp.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\image.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\imagfill.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\imaggif.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\imagiff.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\imagjpeg.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\imagpcx.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\imagpng.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\imagpnm.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\imagtga.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\imagtiff.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\imagxpm.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\layout.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\lboxcmn.cpp"
-			/>
+				>
+			</File>
 			<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>
 			<File
 				RelativePath="..\..\src\common\nbkbase.cpp"
-			/>
+				>
+			</File>
 			<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>
 			<File
 				RelativePath="..\..\src\common\popupcmn.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\prntbase.cpp"
-			/>
+				>
+			</File>
 			<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\srchcmn.cpp"
-			/>
+				RelativePath="..\..\src\common\slidercmn.cpp"
+				>
+			</File>
 			<File
-				RelativePath="..\..\src\common\statbar.cpp"
-			/>
+				RelativePath="..\..\src\common\spinbtncmn.cpp"
+				>
+			</File>
 			<File
-				RelativePath="..\..\src\common\stattextcmn.cpp"
-			/>
+				RelativePath="..\..\src\common\spinctrlcmn.cpp"
+				>
+			</File>
 			<File
-				RelativePath="..\..\src\common\stockitem.cpp"
-			/>
+				RelativePath="..\..\src\common\srchcmn.cpp"
+				>
+			</File>
 			<File
-				RelativePath="..\..\src\common\tbarbase.cpp"
-			/>
+				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>
+			<File
+				RelativePath="..\..\src\common\stockitem.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\common\tbarbase.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\textcmn.cpp"
-			/>
+				>
+			</File>
 			<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>
 			<File
 				RelativePath="..\..\src\common\valgen.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\validate.cpp"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\common\valnum.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\valtext.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\wincmn.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\windowid.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\wrapsizer.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\xpmdecod.cpp"
-			/>
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="MSW Sources"
@@ -1104,2267 +944,627 @@
 			<File
 				RelativePath="..\..\src\msw\accel.cpp"
 				>
-				<FileConfiguration
-					Name="DLL 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"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\ole\access.cpp"
 				>
-				<FileConfiguration
-					Name="DLL 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"
-					ExcludedFromBuild="true"
-				/>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\ole\activex.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\anybutton.cpp"
+				>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\app.cpp"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\artmsw.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\ole\automtn.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\bitmap.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\bmpbuttn.cpp"
 				>
-				<FileConfiguration
-					Name="DLL 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"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\brush.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\button.cpp"
 				>
-				<FileConfiguration
-					Name="DLL 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"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\caret.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\checkbox.cpp"
 				>
-				<FileConfiguration
-					Name="DLL 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"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\checklst.cpp"
 				>
-				<FileConfiguration
-					Name="DLL 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"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\choice.cpp"
 				>
-				<FileConfiguration
-					Name="DLL 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"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\clipbrd.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\colordlg.cpp"
 				>
-				<FileConfiguration
-					Name="DLL 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"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\colour.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\combo.cpp"
 				>
-				<FileConfiguration
-					Name="DLL 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"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\combobox.cpp"
 				>
-				<FileConfiguration
-					Name="DLL 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"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\control.cpp"
 				>
-				<FileConfiguration
-					Name="DLL 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"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\cursor.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\data.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\ole\dataobj.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\dc.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\dcclient.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\dcmemory.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\dcprint.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\dcscreen.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\dialog.cpp"
 				>
-				<FileConfiguration
-					Name="DLL 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"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\dialup.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\dib.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\dirdlg.cpp"
 				>
-				<FileConfiguration
-					Name="DLL 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"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\display.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\dragimag.cpp"
 				>
-				<FileConfiguration
-					Name="DLL 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"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\ole\dropsrc.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\ole\droptgt.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\enhmeta.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\evtloop.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\fdrepdlg.cpp"
 				>
-				<FileConfiguration
-					Name="DLL 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"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\filedlg.cpp"
 				>
-				<FileConfiguration
-					Name="DLL 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"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\font.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\fontdlg.cpp"
 				>
-				<FileConfiguration
-					Name="DLL 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"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\fontenum.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\fontutil.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\frame.cpp"
 				>
-				<FileConfiguration
-					Name="DLL 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"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\gauge.cpp"
 				>
-				<FileConfiguration
-					Name="DLL 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"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\gdiimage.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\gdiobj.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\gdiplus.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\graphics.cpp"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\headerctrl.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\helpchm.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\helpwin.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\icon.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\imaglist.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\iniconf.cpp"
 				>
-				<FileConfiguration
-					Name="DLL 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"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\listbox.cpp"
 				>
-				<FileConfiguration
-					Name="DLL 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"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\listctrl.cpp"
 				>
-				<FileConfiguration
-					Name="DLL 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"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\main.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\mdi.cpp"
 				>
-				<FileConfiguration
-					Name="DLL 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"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\menu.cpp"
 				>
-				<FileConfiguration
-					Name="DLL 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"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\menuitem.cpp"
 				>
-				<FileConfiguration
-					Name="DLL 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"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\metafile.cpp"
 				>
-				<FileConfiguration
-					Name="DLL 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"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\minifram.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\msgdlg.cpp"
 				>
-				<FileConfiguration
-					Name="DLL 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"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\mslu.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\nativdlg.cpp"
 				>
-				<FileConfiguration
-					Name="DLL 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"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\nativewin.cpp"
 				>
-				<FileConfiguration
-					Name="DLL 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"
-					ExcludedFromBuild="true"
-				/>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\nonownedwnd.cpp"
+				>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\notebook.cpp"
 				>
-				<FileConfiguration
-					Name="DLL 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"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\ole\oleutils.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\ownerdrw.cpp"
 				>
-				<FileConfiguration
-					Name="DLL 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"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\palette.cpp"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\panel.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\pen.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\popupwin.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\printdlg.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\printwin.cpp"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\progdlg.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"
-				/>
-				<FileConfiguration
-					Name="Universal Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\radiobut.cpp"
 				>
-				<FileConfiguration
-					Name="DLL 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"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\region.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\renderer.cpp"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\richmsgdlg.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\ole\safearray.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\scrolbar.cpp"
 				>
-				<FileConfiguration
-					Name="DLL 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"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\settings.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\slider.cpp"
 				>
-				<FileConfiguration
-					Name="DLL 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"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\spinbutt.cpp"
 				>
-				<FileConfiguration
-					Name="DLL 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"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\spinctrl.cpp"
 				>
-				<FileConfiguration
-					Name="DLL 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"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\statbmp.cpp"
 				>
-				<FileConfiguration
-					Name="DLL 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"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\statbox.cpp"
 				>
-				<FileConfiguration
-					Name="DLL 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"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\statline.cpp"
 				>
-				<FileConfiguration
-					Name="DLL 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"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\stattext.cpp"
 				>
-				<FileConfiguration
-					Name="DLL 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"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\statusbar.cpp"
 				>
-				<FileConfiguration
-					Name="DLL 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"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
-				RelativePath="..\..\src\msw\tabctrl.cpp"
+				RelativePath="..\..\src\msw\textctrl.cpp"
 				>
-				<FileConfiguration
-					Name="DLL 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"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
-				RelativePath="..\..\src\msw\textctrl.cpp"
+				RelativePath="..\..\src\msw\textentry.cpp"
 				>
-				<FileConfiguration
-					Name="DLL 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"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
-				RelativePath="..\..\src\msw\textentry.cpp"
+				RelativePath="..\..\src\msw\textmeasure.cpp"
 				>
-				<FileConfiguration
-					Name="DLL 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"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\tglbtn.cpp"
 				>
-				<FileConfiguration
-					Name="DLL 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"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\toolbar.cpp"
 				>
-				<FileConfiguration
-					Name="DLL 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"
-					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"
-				/>
-				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Universal Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Universal Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\uiaction.cpp"
+				>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\utilsgui.cpp"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\utilswin.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"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
 					Name="Release|Win32"
 					ExcludedFromBuild="true"
 				/>
-				<FileConfiguration
-					Name="Debug|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\generic\busyinfo.cpp"
 				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
 			</File>
-			<File
-				RelativePath="..\..\src\generic\busyinfo.cpp"
-			/>
 			<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
-				RelativePath="..\..\src\generic\colrdlgg.cpp"
 				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\generic\combog.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\generic\dcpsg.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\generic\dirctrlg.cpp"
-			/>
-			<File
-				RelativePath="..\..\src\generic\dirdlgg.cpp"
 				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\generic\dragimgg.cpp"
-			/>
-			<File
-				RelativePath="..\..\src\generic\fdrepdlg.cpp"
 				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\generic\filectrlg.cpp"
-			/>
-			<File
-				RelativePath="..\..\src\generic\filedlgg.cpp"
 				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\generic\filepickerg.cpp"
-			/>
-			<File
-				RelativePath="..\..\src\generic\fontdlgg.cpp"
 				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\generic\fontpickerg.cpp"
-			/>
+				>
+			</File>
 			<File
-				RelativePath="..\..\src\generic\listbkg.cpp"
-			/>
+				RelativePath="..\..\src\generic\graphicc.cpp"
+				>
+			</File>
 			<File
-				RelativePath="..\..\src\generic\listctrl.cpp"
+				RelativePath="..\..\src\generic\headerctrlg.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\generic\infobar.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\generic\listbkg.cpp"
 				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\generic\logg.cpp"
-			/>
+				>
+			</File>
 			<File
-				RelativePath="..\..\src\generic\mdig.cpp"
+				RelativePath="..\..\src\generic\markuptext.cpp"
 				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\generic\msgdlgg.cpp"
 				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\src\generic\numdlgg.cpp"
-			/>
-			<File
-				RelativePath="..\..\src\generic\panelg.cpp"
-			/>
-			<File
-				RelativePath="..\..\src\generic\printps.cpp"
-			/>
-			<File
-				RelativePath="..\..\src\generic\prntdlgg.cpp"
-			/>
-			<File
-				RelativePath="..\..\src\generic\progdlgg.cpp"
-			/>
-			<File
-				RelativePath="..\..\src\generic\renderg.cpp"
-			/>
-			<File
-				RelativePath="..\..\src\generic\scrlwing.cpp"
-			/>
-			<File
-				RelativePath="..\..\src\generic\selstore.cpp"
-			/>
-			<File
-				RelativePath="..\..\src\generic\spinctlg.cpp"
-			/>
-			<File
-				RelativePath="..\..\src\generic\splitter.cpp"
-			/>
-			<File
-				RelativePath="..\..\src\generic\srchctlg.cpp"
-			/>
-			<File
-				RelativePath="..\..\src\generic\statusbr.cpp"
-				>
-				<FileConfiguration
-					Name="DLL 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"
-					ExcludedFromBuild="true"
-				/>
-			</File>
-			<File
-				RelativePath="..\..\src\generic\tabg.cpp"
-				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-			</File>
-			<File
-				RelativePath="..\..\src\generic\textdlgg.cpp"
-			/>
-			<File
-				RelativePath="..\..\src\generic\tipwin.cpp"
-			/>
-			<File
-				RelativePath="..\..\src\generic\toolbkg.cpp"
-			/>
-			<File
-				RelativePath="..\..\src\generic\treebkg.cpp"
-			/>
-			<File
-				RelativePath="..\..\src\generic\treectlg.cpp"
-			/>
-			<File
-				RelativePath="..\..\src\generic\vlbox.cpp"
-			/>
-			<File
-				RelativePath="..\..\src\generic\vscroll.cpp"
-			/>
-		</Filter>
-		<Filter
-			Name="wxUniv Sources"
-			UniqueIdentifier="{6F354595-5EA6-5848-AAA1-6C4820DE7AEE}"
-			>
-			<File
-				RelativePath="..\..\src\univ\bmpbuttn.cpp"
-				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\button.cpp"
-				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\checkbox.cpp"
 				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
-				RelativePath="..\..\src\univ\checklst.cpp"
+				RelativePath="..\..\src\generic\printps.cpp"
 				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
-				RelativePath="..\..\src\univ\choice.cpp"
+				RelativePath="..\..\src\generic\prntdlgg.cpp"
 				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
-				RelativePath="..\..\src\univ\combobox.cpp"
+				RelativePath="..\..\src\generic\progdlgg.cpp"
 				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
-				RelativePath="..\..\src\univ\control.cpp"
+				RelativePath="..\..\src\generic\renderg.cpp"
 				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
-				RelativePath="..\..\src\univ\ctrlrend.cpp"
+				RelativePath="..\..\src\generic\richmsgdlgg.cpp"
 				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
-				RelativePath="..\..\src\univ\dialog.cpp"
+				RelativePath="..\..\src\generic\scrlwing.cpp"
 				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\framuniv.cpp"
-				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\gauge.cpp"
-				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\themes\gtk.cpp"
-				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\inpcons.cpp"
-				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\inphand.cpp"
-				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\listbox.cpp"
-				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\menu.cpp"
-				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\themes\metal.cpp"
-				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\themes\mono.cpp"
-				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\notebook.cpp"
-				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\radiobox.cpp"
-				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\radiobut.cpp"
-				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\scrarrow.cpp"
-				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\scrolbar.cpp"
-				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\scrthumb.cpp"
-				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\settingsuniv.cpp"
-				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\slider.cpp"
-				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\spinbutt.cpp"
-				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\statbmp.cpp"
-				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\statbox.cpp"
-				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
-				RelativePath="..\..\src\univ\statline.cpp"
+				RelativePath="..\..\src\generic\selstore.cpp"
 				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
-				RelativePath="..\..\src\univ\stattext.cpp"
+				RelativePath="..\..\src\generic\spinctlg.cpp"
 				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
-				RelativePath="..\..\src\univ\statusbr.cpp"
+				RelativePath="..\..\src\generic\splitter.cpp"
 				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
-				RelativePath="..\..\src\univ\stdrend.cpp"
+				RelativePath="..\..\src\generic\srchctlg.cpp"
 				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
-				RelativePath="..\..\src\univ\textctrl.cpp"
+				RelativePath="..\..\src\generic\statbmpg.cpp"
 				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
-				RelativePath="..\..\src\univ\tglbtn.cpp"
+				RelativePath="..\..\src\generic\stattextg.cpp"
 				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
-				RelativePath="..\..\src\univ\theme.cpp"
+				RelativePath="..\..\src\generic\statusbr.cpp"
 				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
-				RelativePath="..\..\src\univ\toolbar.cpp"
+				RelativePath="..\..\src\generic\textdlgg.cpp"
 				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
-				RelativePath="..\..\src\univ\topluniv.cpp"
+				RelativePath="..\..\src\generic\tipwin.cpp"
 				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
-				RelativePath="..\..\src\univ\themes\win32.cpp"
+				RelativePath="..\..\src\generic\toolbkg.cpp"
 				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 			<File
-				RelativePath="..\..\src\univ\winuniv.cpp"
+				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"
 				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
 			</File>
 		</Filter>
 		<Filter
@@ -3374,51 +1574,6 @@
 			<File
 				RelativePath="..\..\include\wx\msw\setup.h"
 				>
-				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-				/>
-				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
-				/>
-				<FileConfiguration
-					Name="DLL Release|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;"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Debug|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;"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Universal Release|Win32"
-				/>
-				<FileConfiguration
-					Name="Universal Debug|Win32"
-				/>
-				<FileConfiguration
-					Name="Release|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;"
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
@@ -3427,68 +1582,53 @@
 						Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"
 						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswud\wx\setup.h"
 						Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"
-						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\univ\setup.h"
-				>
-				<FileConfiguration
-					Name="DLL Universal Release|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;"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="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\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="DLL Release|Win32"
-				/>
 				<FileConfiguration
 					Name="DLL Debug|Win32"
-				/>
-				<FileConfiguration
-					Name="Universal Release|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\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="Universal Debug|Win32"
+					Name="DLL 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\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>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\univ\setup.h"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+				/>
 				<FileConfiguration
 					Name="Release|Win32"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Debug|Win32"
+				/>
+				<FileConfiguration
+					Name="DLL Release|Win32"
 				/>
 			</File>
 		</Filter>
@@ -3498,179 +1638,231 @@
 			>
 			<File
 				RelativePath="..\..\include\wx\msw\accel.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\ole\access.h"
-			/>
+				>
+			</File>
 			<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>
 			<File
 				RelativePath="..\..\include\wx\msw\ole\automtn.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\bitmap.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\bmpbuttn.h"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\bmpcbox.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\brush.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\button.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\calctrl.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\caret.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\checkbox.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\checklst.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\choice.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\clipbrd.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\colordlg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\colour.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\combo.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\combobox.h"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\commandlinkbutton.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\control.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\ctrlsub.h"
-			/>
+				>
+			</File>
 			<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>
 			<File
 				RelativePath="..\..\include\wx\msw\ole\dataobj.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\ole\dataobj2.h"
-			/>
-			<File
-				RelativePath="..\..\include\wx\msw\datecontrols.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\datectrl.h"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\datetimectrl.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\dc.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\dcclient.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\dcmemory.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\dcprint.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\dcscreen.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\dialog.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\dib.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\dirdlg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\dragimag.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\ole\dropsrc.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\ole\droptgt.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\enhmeta.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\evtloop.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\fdrepdlg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\filedlg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\font.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\fontdlg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\frame.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\gauge.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\gdiimage.h"
-			/>
+				>
+			</File>
 			<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
@@ -3685,215 +1877,281 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
-						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h&quot;"
-						Outputs="..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
-						AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivu\wx\msw&quot;"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Universal 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;"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="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;"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
-						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;"
-						Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
-						AdditionalDependencies="&quot;..\..\lib\vc_lib\mswud\wx\msw&quot;"
+						Description="Creating ..\..\lib\vc_dll\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>
 			</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>
 			<File
 				RelativePath="..\..\include\wx\msw\helpchm.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\helpwin.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\htmlhelp.h"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\hyperlink.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\icon.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\imaglist.h"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\iniconf.h"
+				>
+			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\iniconf.h"
-			/>
+				RelativePath="..\..\include\wx\msw\init.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\joystick.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\listbox.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\listctrl.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\mdi.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\menu.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\menuitem.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\metafile.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\minifram.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\missing.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\msgdlg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\msvcrt.h"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\nonownedwnd.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\notebook.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\notifmsg.h"
-			/>
+				>
+			</File>
 			<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>
 			<File
 				RelativePath="..\..\include\wx\msw\popupwin.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\printdlg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\printwin.h"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\progdlg.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\radiobox.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\radiobut.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\rcdefs.h"
-			/>
+				>
+			</File>
 			<File
 				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\setup0.h"
-			/>
+				RelativePath="..\..\include\wx\msw\ole\safearray.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\scrolbar.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\slider.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\sound.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\spinbutt.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\spinctrl.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\statbmp.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\statbox.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\statline.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\stattext.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\statusbar.h"
-			/>
-			<File
-				RelativePath="..\..\include\wx\msw\tabctrl.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\taskbar.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\textctrl.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\textentry.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\tglbtn.h"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\timectrl.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\toolbar.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\tooltip.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\toplevel.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\treectrl.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\ole\uuid.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\uxtheme.h"
-			/>
+				>
+			</File>
 			<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>
 		</Filter>
 		<Filter
 			Name="Generic Headers"
@@ -3901,291 +2159,224 @@
 			>
 			<File
 				RelativePath="..\..\include\wx\generic\aboutdlgg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\accel.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\animate.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\bmpcbox.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\busyinfo.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\buttonbar.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\calctrlg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\choicdgg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\clrpickerg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\collpaneg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\colrdlgg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\combo.h"
-			/>
+				>
+			</File>
 			<File
-				RelativePath="..\..\include\wx\generic\ctrlsub.h"
-			/>
+				RelativePath="..\..\include\wx\generic\custombgwin.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\dataview.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\datectrl.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\dcpsg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\dirctrlg.h"
-			/>
-			<File
-				RelativePath="..\..\include\wx\generic\dirdlgg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\dragimgg.h"
-			/>
+				>
+			</File>
 			<File
-				RelativePath="..\..\include\wx\generic\fdrepdlg.h"
-			/>
+				RelativePath="..\..\include\wx\generic\dvrenderer.h"
+				>
+			</File>
 			<File
-				RelativePath="..\..\include\wx\generic\filectrlg.h"
-			/>
+				RelativePath="..\..\include\wx\generic\dvrenderers.h"
+				>
+			</File>
 			<File
-				RelativePath="..\..\include\wx\generic\filedlgg.h"
-			/>
+				RelativePath="..\..\include\wx\generic\filectrlg.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\filepickerg.h"
-			/>
-			<File
-				RelativePath="..\..\include\wx\generic\fontdlgg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\fontpickerg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\grid.h"
-			/>
+				>
+			</File>
 			<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\laywin.h"
-			/>
+				RelativePath="..\..\include\wx\generic\infobar.h"
+				>
+			</File>
 			<File
-				RelativePath="..\..\include\wx\generic\listctrl.h"
-			/>
+				RelativePath="..\..\include\wx\generic\laywin.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\logg.h"
-			/>
-			<File
-				RelativePath="..\..\include\wx\generic\mdig.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\msgdlgg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\notebook.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\notifmsg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\numdlgg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\panelg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\printps.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\prntdlgg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\progdlgg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\propdlg.h"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\richmsgdlgg.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\sashwin.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\scrolwin.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\spinctlg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\splash.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\splitter.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\srchctlg.h"
-			/>
+				>
+			</File>
 			<File
-				RelativePath="..\..\include\wx\generic\statusbr.h"
-			/>
+				RelativePath="..\..\include\wx\generic\statbmpg.h"
+				>
+			</File>
 			<File
-				RelativePath="..\..\include\wx\generic\tabg.h"
-			/>
+				RelativePath="..\..\include\wx\generic\stattextg.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\textdlgg.h"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\timectrl.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\treectlg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\wizard.h"
-			/>
-		</Filter>
-		<Filter
-			Name="wxUniv Headers"
-			UniqueIdentifier="{46168D7C-2783-50F3-AE9D-A740D5FF0B44}"
-			>
-			<File
-				RelativePath="..\..\include\wx\univ\app.h"
-			/>
-			<File
-				RelativePath="..\..\include\wx\univ\bmpbuttn.h"
-			/>
-			<File
-				RelativePath="..\..\include\wx\univ\button.h"
-			/>
-			<File
-				RelativePath="..\..\include\wx\univ\checkbox.h"
-			/>
-			<File
-				RelativePath="..\..\include\wx\univ\checklst.h"
-			/>
-			<File
-				RelativePath="..\..\include\wx\univ\chkconf.h"
-			/>
-			<File
-				RelativePath="..\..\include\wx\univ\choice.h"
-			/>
-			<File
-				RelativePath="..\..\include\wx\univ\colschem.h"
-			/>
-			<File
-				RelativePath="..\..\include\wx\univ\combobox.h"
-			/>
-			<File
-				RelativePath="..\..\include\wx\univ\control.h"
-			/>
-			<File
-				RelativePath="..\..\include\wx\univ\dialog.h"
-			/>
-			<File
-				RelativePath="..\..\include\wx\univ\frame.h"
-			/>
-			<File
-				RelativePath="..\..\include\wx\univ\gauge.h"
-			/>
-			<File
-				RelativePath="..\..\include\wx\univ\inpcons.h"
-			/>
-			<File
-				RelativePath="..\..\include\wx\univ\inphand.h"
-			/>
-			<File
-				RelativePath="..\..\include\wx\univ\listbox.h"
-			/>
-			<File
-				RelativePath="..\..\include\wx\univ\menu.h"
-			/>
-			<File
-				RelativePath="..\..\include\wx\univ\menuitem.h"
-			/>
-			<File
-				RelativePath="..\..\include\wx\univ\notebook.h"
-			/>
-			<File
-				RelativePath="..\..\include\wx\univ\radiobox.h"
-			/>
-			<File
-				RelativePath="..\..\include\wx\univ\radiobut.h"
-			/>
-			<File
-				RelativePath="..\..\include\wx\univ\renderer.h"
-			/>
-			<File
-				RelativePath="..\..\include\wx\univ\scrarrow.h"
-			/>
-			<File
-				RelativePath="..\..\include\wx\univ\scrolbar.h"
-			/>
-			<File
-				RelativePath="..\..\include\wx\univ\scrthumb.h"
-			/>
-			<File
-				RelativePath="..\..\include\wx\univ\scrtimer.h"
-			/>
-			<File
-				RelativePath="..\..\include\wx\univ\slider.h"
-			/>
-			<File
-				RelativePath="..\..\include\wx\univ\spinbutt.h"
-			/>
-			<File
-				RelativePath="..\..\include\wx\univ\statbmp.h"
-			/>
-			<File
-				RelativePath="..\..\include\wx\univ\statbox.h"
-			/>
-			<File
-				RelativePath="..\..\include\wx\univ\statline.h"
-			/>
-			<File
-				RelativePath="..\..\include\wx\univ\stattext.h"
-			/>
-			<File
-				RelativePath="..\..\include\wx\univ\statusbr.h"
-			/>
-			<File
-				RelativePath="..\..\include\wx\univ\stdrend.h"
-			/>
-			<File
-				RelativePath="..\..\include\wx\univ\textctrl.h"
-			/>
-			<File
-				RelativePath="..\..\include\wx\univ\tglbtn.h"
-			/>
-			<File
-				RelativePath="..\..\include\wx\univ\theme.h"
-			/>
-			<File
-				RelativePath="..\..\include\wx\univ\toolbar.h"
-			/>
-			<File
-				RelativePath="..\..\include\wx\univ\toplevel.h"
-			/>
-			<File
-				RelativePath="..\..\include\wx\univ\window.h"
-			/>
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="wxHTML Headers"
@@ -4193,49 +2384,68 @@
 			>
 			<File
 				RelativePath="..\..\include\wx\html\helpctrl.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\html\helpdata.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\html\helpdlg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\html\helpfrm.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\html\helpwnd.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\html\htmlcell.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\html\htmldefs.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\html\htmlfilt.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\html\htmlpars.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\html\htmlproc.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\html\htmltag.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\html\htmlwin.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\html\htmprint.h"
-			/>
+				>
+			</File>
 			<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>
 		</Filter>
 		<Filter
 			Name="Common Headers"
@@ -4243,811 +2453,1406 @@
 			>
 			<File
 				RelativePath="..\..\include\wx\aboutdlg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\accel.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\access.h"
-			/>
+				>
+			</File>
+			<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>
+			<File
+				RelativePath="..\..\include\wx\animate.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\animdecod.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\anybutton.h"
+				>
+			</File>
 			<File
-				RelativePath="..\..\include\wx\animate.h"
-			/>
+				RelativePath="..\..\include\wx\ribbon\art.h"
+				>
+			</File>
 			<File
-				RelativePath="..\..\include\wx\animdecod.h"
-			/>
+				RelativePath="..\..\include\wx\ribbon\art_internal.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\artprov.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\aui\aui.h"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\aui\auibar.h"
+				>
+			</File>
 			<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>
 			<File
 				RelativePath="..\..\include\wx\bmpbuttn.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\bmpcbox.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\bookctrl.h"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\persist\bookctrl.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\brush.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\busyinfo.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\button.h"
-			/>
+				>
+			</File>
 			<File
-				RelativePath="..\..\include\wx\cairo.h"
-			/>
+				RelativePath="..\..\include\wx\ribbon\buttonbar.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\calctrl.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\caret.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\checkbox.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\checklst.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\choicdlg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\choice.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\choicebk.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\clipbrd.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\clrpicker.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\cmdproc.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\cmndata.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\collpane.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\colordlg.h"
-			/>
+				>
+			</File>
 			<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>
 			<File
 				RelativePath="..\..\include\wx\ctrlsub.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\cursor.h"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\custombgwin.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\dataobj.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\dataview.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\datectrl.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\dateevt.h"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\datetimectrl.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\dc.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\dcbuffer.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\dcclient.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\dcgraph.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\dcmemory.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\dcmirror.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\dcprint.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\dcps.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\dcscreen.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\dcsvg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\debugrpt.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\dialog.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\dialup.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\dirctrl.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\dirdlg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\display.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\display_impl.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\dnd.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\aui\dockart.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\docmdi.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\docview.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\dragimag.h"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\dvrenderers.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\editlbox.h"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\propgrid\editors.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\effects.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\encinfo.h"
-			/>
+				>
+			</File>
 			<File
-				RelativePath="..\..\include\wx\evtloop.h"
-			/>
+				RelativePath="..\..\include\wx\evtloopsrc.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\fdrepdlg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\filectrl.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\filedlg.h"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\filehistory.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\filepicker.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\aui\floatpane.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\fmappriv.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\font.h"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\fontdata.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\fontdlg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\fontenum.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\fontpicker.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\fontutil.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\frame.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\aui\framemanager.h"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\ribbon\gallery.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\gauge.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\gbsizer.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\gdicmn.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\gdiobj.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\geometry.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\gifdecod.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\glcanvas.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\graphics.h"
-			/>
+				>
+			</File>
 			<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>
 			<File
 				RelativePath="..\..\include\wx\helpbase.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\helphtml.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\helpwin.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\htmllbox.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\hyperlink.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\icon.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\iconbndl.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\imagbmp.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\image.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\imaggif.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\imagiff.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\imagjpeg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\imaglist.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\imagpcx.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\imagpng.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\imagpnm.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\imagtga.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\imagtiff.h"
-			/>
+				>
+			</File>
 			<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>
 			<File
 				RelativePath="..\..\include\wx\layout.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\laywin.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\listbase.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\listbook.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\listbox.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\listctrl.h"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\propgrid\manager.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\matrix.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\mdi.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\mediactrl.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\menu.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\menuitem.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\metafile.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\minifram.h"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\mousemanager.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msgdlg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\nativewin.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\nonownedwnd.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\notebook.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\notifmsg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\numdlg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\odcombo.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\overlay.h"
-			/>
+				>
+			</File>
 			<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>
 			<File
 				RelativePath="..\..\include\wx\popupwin.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\position.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\print.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\printdlg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\prntbase.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\progdlg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\propdlg.h"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\propgrid\property.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\propgrid\propgrid.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\propgrid\propgriddefs.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\propgrid\propgridiface.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\propgrid\propgridpagestate.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\propgrid\props.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\quantize.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\radiobox.h"
-			/>
+				>
+			</File>
 			<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>
 			<File
 				RelativePath="..\..\include\wx\scopeguard.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\scrolbar.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\scrolwin.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\selstore.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\settings.h"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\simplebook.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\sizer.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\slider.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\sound.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\spinbutt.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\spinctrl.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\splash.h"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\persist\splitter.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\splitter.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\srchctrl.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\statbmp.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\statbox.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\statline.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\stattext.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\statusbr.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\stc\stc.h"
-			/>
-			<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"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\taskbar.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\tbarbase.h"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\textcompleter.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\textctrl.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\textdlg.h"
-			/>
+				>
+			</File>
 			<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>
 			<File
 				RelativePath="..\..\include\wx\tipwin.h"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\ribbon\toolbar.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\toolbar.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\toolbook.h"
-			/>
+				>
+			</File>
 			<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>
 			<File
 				RelativePath="..\..\include\wx\vidmode.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\vlbox.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\vms_x_fix.h"
-			/>
+				>
+			</File>
 			<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>
 			<File
 				RelativePath="..\..\include\wx\wrapsizer.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\wupdlock.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\wxhtml.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_all.h"
-			/>
+				>
+			</File>
 			<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>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_bmpbt.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_bmpcbox.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_bttn.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_cald.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_chckb.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_chckl.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_choic.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_choicbk.h"
-			/>
+				>
+			</File>
 			<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>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_dirpicker.h"
-			/>
+				>
+			</File>
 			<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>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_fontpicker.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_frame.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_gauge.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_gdctl.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_grid.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_html.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_htmllbox.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_hyperlink.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_listb.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_listbk.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_listc.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_mdi.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_menu.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_notbk.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_odcombo.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_panel.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_propdlg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_radbt.h"
-			/>
+				>
+			</File>
 			<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>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_scwin.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_sizer.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_slidr.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_spin.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_split.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_srchctrl.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_statbar.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_stbmp.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_stbox.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_stlin.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_sttxt.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_text.h"
-			/>
+				>
+			</File>
 			<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>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_treebk.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_unkwn.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_wizrd.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xmlres.h"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xmlreshandler.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xpmdecod.h"
-			/>
+				>
+			</File>
 			<File
 				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>