supporting alignment in single line controls, see #14452

[wxWidgets.git] / build / msw / wx_vc8_core.vcproj
diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj

index 28360a98a019d9e8da376f52acdaad17787a9498..79923e2ed3d7a58d63825fd95d633be4e787d8f6 100644 (file)
--- a/build/msw/wx_vc8_core.vcproj
+++ b/build/msw/wx_vc8_core.vcproj
@@ -1,8 +1,8 @@
  <?xml version="1.0" encoding="Windows-1252"?>\r
  <!--\r
  \r
  <?xml version="1.0" encoding="Windows-1252"?>\r
  <!--\r
  \r
-  This makefile was generated by\r
-  Bakefile 0.2.5 (http://www.bakefile.org)\r
+  This project was generated by\r
+  Bakefile 0.2.9 (http://www.bakefile.org)\r
    Do not modify, all changes will be overwritten!\r
  \r
  -->\r
    Do not modify, all changes will be overwritten!\r
  \r
  -->\r
@@ -22,10 +22,95 @@
         </ToolFiles>\r
         <Configurations>\r
                 <Configuration\r
         </ToolFiles>\r
         <Configurations>\r
                 <Configuration\r
-                       Name="DLL Universal Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswunivudll\core"\r
-                       ConfigurationType="2"\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswud\core"\r
+                       ConfigurationType="4"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       CharacterSet="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               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"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               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"\r
+                               MinimalRebuild="true"\r
+                               ExceptionHandling="1"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
+                               RuntimeTypeInfo="true"\r
+                               UsePrecompiledHeader="2"\r
+                               PrecompiledHeaderThrough="wx/wxprec.h"\r
+                               PrecompiledHeaderFile="vc_mswud\wxprec_corelib.pch"\r
+                               ObjectFile="vc_mswud\core\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_core.pdb"\r
+                               WarningLevel="4"\r
+                               SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxmsw29ud_core.lib"\r
+                               SuppressStartupBanner="true"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                               OutputFile="..\..\lib\vc_lib\wx_vc8_core.bsc"\r
+                               SuppressStartupBanner="true"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswu\core"\r
+                       ConfigurationType="4"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
@@ -44,21 +129,22 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
+                               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"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               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"\r
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivudll\wxprec_coredll.pch"\r
-                               AssemblerListingLocation="vc_mswunivudll\core\"\r
-                               ObjectFile="vc_mswunivudll\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb"\r
+                               PrecompiledHeaderFile="vc_mswu\wxprec_corelib.pch"\r
+                               ObjectFile="vc_mswu\core\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_core.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -69,26 +155,17 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
-                               Name="VCLinkerTool"\r
-                               AdditionalOptions=""\r
-                               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"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.dll"\r
-                               LinkIncremental="2"\r
-                               ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_core.lib"\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxmsw29u_core.lib"\r
                                 SuppressStartupBanner="true"\r
                                 SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateManifest="true"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb"\r
-                               TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -101,7 +178,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_dll\wx_vc8_core.bsc"\r
+                               OutputFile="..\..\lib\vc_lib\wx_vc8_core.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -112,10 +189,10 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="DLL Universal Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswunivuddll\core"\r
-                       ConfigurationType="2"\r
+                       Name="Universal Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswunivud\core"\r
+                       ConfigurationType="4"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
@@ -134,12 +211,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
@@ -148,10 +227,9 @@
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivuddll\wxprec_coredll.pch"\r
-                               AssemblerListingLocation="vc_mswunivuddll\core\"\r
-                               ObjectFile="vc_mswunivuddll\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivud\wxprec_corelib.pch"\r
+                               ObjectFile="vc_mswunivud\core\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_core.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -162,26 +240,17 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
-                               Name="VCLinkerTool"\r
-                               AdditionalOptions=""\r
-                               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"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.dll"\r
-                               LinkIncremental="2"\r
-                               ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_core.lib"\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_core.lib"\r
                                 SuppressStartupBanner="true"\r
                                 SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateManifest="true"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb"\r
-                               TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -194,7 +263,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_dll\wx_vc8_core.bsc"\r
+                               OutputFile="..\..\lib\vc_lib\wx_vc8_core.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -205,10 +274,10 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="DLL Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswudll\core"\r
-                       ConfigurationType="2"\r
+                       Name="Universal Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswunivu\core"\r
+                       ConfigurationType="4"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
@@ -227,21 +296,22 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswudll\wxprec_coredll.pch"\r
-                               AssemblerListingLocation="vc_mswudll\core\"\r
-                               ObjectFile="vc_mswudll\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivu\wxprec_corelib.pch"\r
+                               ObjectFile="vc_mswunivu\core\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_core.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -252,26 +322,17 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
-                               Name="VCLinkerTool"\r
-                               AdditionalOptions=""\r
-                               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"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw290u_core_vc_custom.dll"\r
-                               LinkIncremental="2"\r
-                               ImportLibrary="..\..\lib\vc_dll\wxmsw29u_core.lib"\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxmswuniv29u_core.lib"\r
                                 SuppressStartupBanner="true"\r
                                 SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateManifest="true"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb"\r
-                               TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -284,7 +345,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_dll\wx_vc8_core.bsc"\r
+                               OutputFile="..\..\lib\vc_lib\wx_vc8_core.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -317,12 +378,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
+                               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"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
+                               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"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
@@ -332,9 +395,8 @@
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 PrecompiledHeaderFile="vc_mswuddll\wxprec_coredll.pch"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 PrecompiledHeaderFile="vc_mswuddll\wxprec_coredll.pch"\r
-                               AssemblerListingLocation="vc_mswuddll\core\"\r
                                 ObjectFile="vc_mswuddll\core\"\r
                                 ObjectFile="vc_mswuddll\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294ud_core_vc_custom.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -345,7 +407,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -355,15 +417,15 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               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"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.dll"\r
+                               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"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294ud_core_vc_custom.dll"\r
                                 LinkIncremental="2"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_core.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 LinkIncremental="2"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_core.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294ud_core_vc_custom.pdb"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
@@ -388,10 +450,10 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Universal Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswunivu\core"\r
-                       ConfigurationType="4"\r
+                       Name="DLL Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswudll\core"\r
+                       ConfigurationType="2"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
@@ -410,21 +472,22 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
+                               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"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               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"\r
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivu\wxprec_corelib.pch"\r
-                               AssemblerListingLocation="vc_mswunivu\core\"\r
-                               ObjectFile="vc_mswunivu\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_core.pdb"\r
+                               PrecompiledHeaderFile="vc_mswudll\wxprec_coredll.pch"\r
+                               ObjectFile="vc_mswudll\core\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294u_core_vc_custom.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -435,17 +498,28 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmswuniv29u_core.lib"\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               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"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294u_core_vc_custom.dll"\r
+                               LinkIncremental="1"\r
+                               ImportLibrary="..\..\lib\vc_dll\wxmsw29u_core.lib"\r
                                 SuppressStartupBanner="true"\r
                                 SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+                               GenerateManifest="true"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294u_core_vc_custom.pdb"\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -458,7 +532,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc8_core.bsc"\r
+                               OutputFile="..\..\lib\vc_dll\wx_vc8_core.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -469,10 +543,10 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Universal Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswunivud\core"\r
-                       ConfigurationType="4"\r
+                       Name="DLL Universal Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswunivuddll\core"\r
+                       ConfigurationType="2"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
@@ -491,12 +565,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
@@ -505,10 +581,9 @@
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivud\wxprec_corelib.pch"\r
-                               AssemblerListingLocation="vc_mswunivud\core\"\r
-                               ObjectFile="vc_mswunivud\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_core.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivuddll\wxprec_coredll.pch"\r
+                               ObjectFile="vc_mswunivuddll\core\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294ud_core_vc_custom.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -519,17 +594,26 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_core.lib"\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               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"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294ud_core_vc_custom.dll"\r
+                               LinkIncremental="2"\r
+                               ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_core.lib"\r
                                 SuppressStartupBanner="true"\r
                                 SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+                               GenerateManifest="true"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294ud_core_vc_custom.pdb"\r
+                               TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -542,7 +626,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc8_core.bsc"\r
+                               OutputFile="..\..\lib\vc_dll\wx_vc8_core.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -553,10 +637,10 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswu\core"\r
-                       ConfigurationType="4"\r
+                       Name="DLL Universal Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswunivudll\core"\r
+                       ConfigurationType="2"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
@@ -575,21 +659,22 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswu\wxprec_corelib.pch"\r
-                               AssemblerListingLocation="vc_mswu\core\"\r
-                               ObjectFile="vc_mswu\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_core.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivudll\wxprec_coredll.pch"\r
+                               ObjectFile="vc_mswunivudll\core\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294u_core_vc_custom.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -600,101 +685,28 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmsw29u_core.lib"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc8_core.bsc"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswud\core"\r
-                       ConfigurationType="4"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
-                       CharacterSet="1"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
-                               RuntimeTypeInfo="true"\r
-                               UsePrecompiledHeader="2"\r
-                               PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswud\wxprec_corelib.pch"\r
-                               AssemblerListingLocation="vc_mswud\core\"\r
-                               ObjectFile="vc_mswud\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_core.pdb"\r
-                               WarningLevel="4"\r
-                               SuppressStartupBanner="true"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmsw29ud_core.lib"\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               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"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294u_core_vc_custom.dll"\r
+                               LinkIncremental="1"\r
+                               ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_core.lib"\r
                                 SuppressStartupBanner="true"\r
                                 SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+                               GenerateManifest="true"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294u_core_vc_custom.pdb"\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -707,7 +719,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc8_core.bsc"\r
+                               OutputFile="..\..\lib\vc_dll\wx_vc8_core.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -734,6 +746,10 @@
                                 RelativePath="..\..\src\common\accesscmn.cpp"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\src\common\accesscmn.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\affinematrix2d.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\anidecod.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\common\anidecod.cpp"\r
                                 >\r
@@ -750,10 +766,18 @@
                                 RelativePath="..\..\src\common\artstd.cpp"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\src\common\artstd.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\arttango.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\bmpbase.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\bmpbase.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\bmpbtncmn.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\bookctrl.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\common\bookctrl.cpp"\r
                                 >\r
@@ -766,6 +790,14 @@
                                 RelativePath="..\..\src\common\cairo.cpp"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\src\common\cairo.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\checkboxcmn.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\checklstcmn.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\choiccmn.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\common\choiccmn.cpp"\r
                                 >\r
@@ -790,6 +822,10 @@
                                 RelativePath="..\..\src\common\colourcmn.cpp"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\src\common\colourcmn.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\colourdata.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\combocmn.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\common\combocmn.cpp"\r
                                 >\r
@@ -810,10 +846,6 @@
                                 RelativePath="..\..\src\common\ctrlsub.cpp"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\src\common\ctrlsub.cpp"\r
                                 >\r
                         </File>\r
-                       <File\r
-                               RelativePath="..\..\src\common\datacmn.cpp"\r
-                               >\r
-                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\dcbase.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\common\dcbase.cpp"\r
                                 >\r
@@ -830,6 +862,10 @@
                                 RelativePath="..\..\src\common\dcsvg.cpp"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\src\common\dcsvg.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\dirctrlcmn.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\dlgcmn.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\common\dlgcmn.cpp"\r
                                 >\r
@@ -862,7 +898,7 @@
                                 RelativePath="..\..\src\common\dummy.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\src\common\dummy.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -870,7 +906,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -878,7 +914,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -886,7 +922,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -894,7 +930,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -902,7 +938,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -910,7 +946,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -918,7 +954,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -942,6 +978,10 @@
                                 RelativePath="..\..\src\common\filectrlcmn.cpp"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\src\common\filectrlcmn.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\filehistorycmn.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\filepickercmn.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\common\filepickercmn.cpp"\r
                                 >\r
@@ -954,6 +994,10 @@
                                 RelativePath="..\..\src\common\fontcmn.cpp"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\src\common\fontcmn.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\fontdata.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\fontenumcmn.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\common\fontenumcmn.cpp"\r
                                 >\r
@@ -1002,6 +1046,14 @@
                                 RelativePath="..\..\src\common\graphcmn.cpp"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\src\common\graphcmn.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\headercolcmn.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\headerctrlcmn.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\helpbase.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\common\helpbase.cpp"\r
                                 >\r
@@ -1074,6 +1126,10 @@
                                 RelativePath="..\..\src\common\listctrlcmn.cpp"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\src\common\listctrlcmn.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\markupparser.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\matrix.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\common\matrix.cpp"\r
                                 >\r
@@ -1082,6 +1138,10 @@
                                 RelativePath="..\..\src\common\menucmn.cpp"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\src\common\menucmn.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\mousemanager.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\msgout.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\common\msgout.cpp"\r
                                 >\r
@@ -1094,10 +1154,22 @@
                                 RelativePath="..\..\src\common\overlaycmn.cpp"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\src\common\overlaycmn.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\ownerdrwcmn.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\panelcmn.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\paper.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\paper.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\persist.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\pickerbase.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\common\pickerbase.cpp"\r
                                 >\r
@@ -1114,10 +1186,18 @@
                                 RelativePath="..\..\src\common\quantize.cpp"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\src\common\quantize.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\radiobtncmn.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\radiocmn.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\radiocmn.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\rearrangectrl.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\rendcmn.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\common\rendcmn.cpp"\r
                                 >\r
@@ -1126,6 +1206,10 @@
                                 RelativePath="..\..\src\common\rgncmn.cpp"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\src\common\rgncmn.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\scrolbarcmn.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\settcmn.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\common\settcmn.cpp"\r
                                 >\r
@@ -1134,6 +1218,18 @@
                                 RelativePath="..\..\src\common\sizer.cpp"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\src\common\sizer.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\slidercmn.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\spinbtncmn.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\spinctrlcmn.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\srchcmn.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\common\srchcmn.cpp"\r
                                 >\r
@@ -1142,6 +1238,18 @@
                                 RelativePath="..\..\src\common\statbar.cpp"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\src\common\statbar.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\statbmpcmn.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\statboxcmn.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\statlinecmn.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\stattextcmn.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\common\stattextcmn.cpp"\r
                                 >\r
@@ -1170,6 +1278,10 @@
                                 RelativePath="..\..\src\common\treebase.cpp"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\src\common\treebase.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\uiactioncmn.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\utilscmn.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\common\utilscmn.cpp"\r
                                 >\r
@@ -1182,6 +1294,10 @@
                                 RelativePath="..\..\src\common\validate.cpp"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\src\common\validate.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\valnum.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\valtext.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\common\valtext.cpp"\r
                                 >\r
@@ -1211,19 +1327,51 @@
                                 RelativePath="..\..\src\msw\accel.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\src\msw\accel.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_accel.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_accel.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_accel.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_accel.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
@@ -1231,71 +1379,127 @@
                                 RelativePath="..\..\src\msw\ole\access.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\src\msw\ole\access.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\app.cpp"\r
+                               RelativePath="..\..\src\msw\ole\activex.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\artmsw.cpp"\r
+                               RelativePath="..\..\src\msw\anybutton.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\ole\automtn.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\bitmap.cpp"\r
+                               RelativePath="..\..\src\msw\app.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\bmpbuttn.cpp"\r
+                               RelativePath="..\..\src\msw\artmsw.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\ole\automtn.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\bitmap.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\bmpbuttn.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_bmpbuttn.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_bmpbuttn.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_bmpbuttn.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_bmpbuttn.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
@@ -1306,144 +1510,664 @@
                         <File\r
                                 RelativePath="..\..\src\msw\button.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\msw\button.cpp"\r
                                 >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_button.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_button.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_button.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_button.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
                                 <FileConfiguration\r
                                         Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\caret.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\checkbox.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_checkbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_checkbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_checkbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_checkbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                         Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\checklst.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_checklst.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_checklst.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_checklst.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_checklst.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\choice.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_choice.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_choice.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                         Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_choice.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_choice.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\caret.cpp"\r
+                               RelativePath="..\..\src\msw\clipbrd.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\checkbox.cpp"\r
+                               RelativePath="..\..\src\msw\colordlg.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\colour.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\combo.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\combobox.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_combobox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_combobox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_combobox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_combobox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\control.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_control.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_control.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_control.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_control.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\cursor.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\data.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\ole\dataobj.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\dc.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\dcclient.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\dcmemory.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\dcprint.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\dcscreen.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\dialog.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_dialog.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_dialog.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_dialog.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_dialog.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\dialup.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\dib.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\dirdlg.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\display.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\dragimag.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\checklst.cpp"\r
+                               RelativePath="..\..\src\msw\ole\dropsrc.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\ole\droptgt.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\enhmeta.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\evtloop.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\fdrepdlg.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_fdrepdlg.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_fdrepdlg.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_fdrepdlg.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_fdrepdlg.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\choice.cpp"\r
+                               RelativePath="..\..\src\msw\filedlg.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\clipbrd.cpp"\r
+                               RelativePath="..\..\src\msw\font.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\colordlg.cpp"\r
+                               RelativePath="..\..\src\msw\fontdlg.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\colour.cpp"\r
+                               RelativePath="..\..\src\msw\fontenum.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\combo.cpp"\r
+                               RelativePath="..\..\src\msw\fontutil.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\frame.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\combobox.cpp"\r
+                               RelativePath="..\..\src\msw\gauge.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_gauge.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_gauge.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
@@ -1451,123 +2175,123 @@
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\control.cpp"\r
-                               >\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_gauge.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_gauge.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                         Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
                                         Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\cursor.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\data.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\ole\dataobj.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\dc.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\dcclient.cpp"\r
+                               RelativePath="..\..\src\msw\gdiimage.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\dcmemory.cpp"\r
+                               RelativePath="..\..\src\msw\gdiobj.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\dcprint.cpp"\r
+                               RelativePath="..\..\src\msw\gdiplus.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\dcscreen.cpp"\r
+                               RelativePath="..\..\src\msw\graphics.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\dialog.cpp"\r
+                               RelativePath="..\..\src\msw\headerctrl.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\dialup.cpp"\r
+                               RelativePath="..\..\src\msw\helpchm.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\dib.cpp"\r
+                               RelativePath="..\..\src\msw\helpwin.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\dirdlg.cpp"\r
+                               RelativePath="..\..\src\msw\icon.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\imaglist.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\iniconf.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\display.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\dragimag.cpp"\r
+                               RelativePath="..\..\src\msw\listbox.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_listbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_listbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
@@ -1575,55 +2299,51 @@
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\ole\dropsrc.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\ole\droptgt.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\enhmeta.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\evtloop.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\fdrepdlg.cpp"\r
-                               >\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_listbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_listbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                         Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
                                         Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\filedlg.cpp"\r
+                               RelativePath="..\..\src\msw\listctrl.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_listctrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_listctrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
@@ -1631,71 +2351,75 @@
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\font.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\fontdlg.cpp"\r
-                               >\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_listctrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_listctrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                         Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
                                         Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\fontenum.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\fontutil.cpp"\r
+                               RelativePath="..\..\src\msw\main.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\frame.cpp"\r
+                               RelativePath="..\..\src\msw\mdi.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\gauge.cpp"\r
+                               RelativePath="..\..\src\msw\menu.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_menu.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_menu.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
@@ -1703,399 +2427,539 @@
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\gdiimage.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\gdiobj.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\gdiplus.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\graphics.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\helpchm.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\helpwin.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\icon.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\imaglist.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\iniconf.cpp"\r
-                               >\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_menu.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_menu.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                         Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
                                         Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\listbox.cpp"\r
+                               RelativePath="..\..\src\msw\menuitem.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\listctrl.cpp"\r
+                               RelativePath="..\..\src\msw\metafile.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\main.cpp"\r
+                               RelativePath="..\..\src\msw\minifram.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\mdi.cpp"\r
+                               RelativePath="..\..\src\msw\msgdlg.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\menu.cpp"\r
+                               RelativePath="..\..\src\msw\mslu.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\nativdlg.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\menuitem.cpp"\r
+                               RelativePath="..\..\src\msw\nativewin.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\metafile.cpp"\r
+                               RelativePath="..\..\src\msw\nonownedwnd.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\notebook.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_notebook.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_notebook.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_notebook.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_notebook.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\minifram.cpp"\r
+                               RelativePath="..\..\src\msw\ole\oleutils.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\msgdlg.cpp"\r
+                               RelativePath="..\..\src\msw\ownerdrw.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\mslu.cpp"\r
+                               RelativePath="..\..\src\msw\palette.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\nativdlg.cpp"\r
+                               RelativePath="..\..\src\msw\panel.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\nativewin.cpp"\r
+                               RelativePath="..\..\src\msw\pen.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\popupwin.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\printdlg.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\printwin.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\progdlg.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\notebook.cpp"\r
+                               RelativePath="..\..\src\msw\radiobox.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_radiobox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_radiobox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_radiobox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_radiobox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\ole\oleutils.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\ownerdrw.cpp"\r
+                               RelativePath="..\..\src\msw\radiobut.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_radiobut.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_radiobut.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_radiobut.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_radiobut.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\palette.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\pen.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\popupwin.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\printdlg.cpp"\r
+                               RelativePath="..\..\src\msw\region.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\printwin.cpp"\r
+                               RelativePath="..\..\src\msw\renderer.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\radiobox.cpp"\r
+                               RelativePath="..\..\src\msw\richmsgdlg.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\radiobut.cpp"\r
+                               RelativePath="..\..\src\msw\scrolbar.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_scrolbar.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_scrolbar.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_scrolbar.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_scrolbar.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\region.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\renderer.cpp"\r
+                               RelativePath="..\..\src\msw\settings.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\scrolbar.cpp"\r
+                               RelativePath="..\..\src\msw\slider.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_slider.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_slider.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_slider.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_slider.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\settings.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\slider.cpp"\r
+                               RelativePath="..\..\src\msw\spinbutt.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_spinbutt.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_spinbutt.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
@@ -2103,27 +2967,27 @@
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\spinbutt.cpp"\r
-                               >\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_spinbutt.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_spinbutt.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                         Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
                                         Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
@@ -2131,19 +2995,19 @@
                                 RelativePath="..\..\src\msw\spinctrl.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\src\msw\spinctrl.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
@@ -2151,19 +3015,51 @@
                                 RelativePath="..\..\src\msw\statbmp.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\src\msw\statbmp.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_statbmp.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_statbmp.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_statbmp.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_statbmp.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
@@ -2171,19 +3067,51 @@
                                 RelativePath="..\..\src\msw\statbox.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\src\msw\statbox.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_statbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_statbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_statbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_statbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
@@ -2191,19 +3119,51 @@
                                 RelativePath="..\..\src\msw\statline.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\src\msw\statline.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_statline.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_statline.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_statline.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_statline.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
@@ -2211,19 +3171,51 @@
                                 RelativePath="..\..\src\msw\stattext.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\src\msw\stattext.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_stattext.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_stattext.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_stattext.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_stattext.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
@@ -2231,71 +3223,115 @@
                                 RelativePath="..\..\src\msw\statusbar.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\src\msw\statusbar.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\tabctrl.cpp"\r
+                               RelativePath="..\..\src\msw\textctrl.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_textctrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_textctrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_textctrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_textctrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\textctrl.cpp"\r
+                               RelativePath="..\..\src\msw\textentry.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\textentry.cpp"\r
+                               RelativePath="..\..\src\msw\tglbtn.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_tglbtn.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_tglbtn.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
@@ -2303,27 +3339,27 @@
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\tglbtn.cpp"\r
-                               >\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_tglbtn.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_tglbtn.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                         Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
                                         Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
@@ -2331,19 +3367,51 @@
                                 RelativePath="..\..\src\msw\toolbar.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\src\msw\toolbar.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_toolbar.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_toolbar.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_toolbar.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_toolbar.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
@@ -2359,22 +3427,26 @@
                                 RelativePath="..\..\src\msw\treectrl.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\src\msw\treectrl.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\uiaction.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\utilsgui.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\msw\utilsgui.cpp"\r
                                 >\r
@@ -2391,19 +3463,19 @@
                                 RelativePath="..\..\src\msw\version.rc"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\src\msw\version.rc"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
@@ -2424,21 +3496,53 @@
                                 RelativePath="..\..\src\generic\accel.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\src\generic\accel.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\generic_accel.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\generic_accel.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                         ExcludedFromBuild="true"\r
                                 />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\generic_accel.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\generic_accel.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\generic\busyinfo.cpp"\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\generic\busyinfo.cpp"\r
@@ -2468,19 +3572,19 @@
                                 RelativePath="..\..\src\generic\colrdlgg.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\src\generic\colrdlgg.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
@@ -2500,19 +3604,19 @@
                                 RelativePath="..\..\src\generic\dirdlgg.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\src\generic\dirdlgg.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
@@ -2524,21 +3628,53 @@
                                 RelativePath="..\..\src\generic\fdrepdlg.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\src\generic\fdrepdlg.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\generic_fdrepdlg.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\generic_fdrepdlg.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                         ExcludedFromBuild="true"\r
                                 />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\generic_fdrepdlg.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\generic_fdrepdlg.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\generic\filectrlg.cpp"\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\generic\filectrlg.cpp"\r
@@ -2548,19 +3684,19 @@
                                 RelativePath="..\..\src\generic\filedlgg.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\src\generic\filedlgg.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
@@ -2572,19 +3708,19 @@
                                 RelativePath="..\..\src\generic\fontdlgg.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\src\generic\fontdlgg.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
@@ -2592,6 +3728,18 @@
                                 RelativePath="..\..\src\generic\fontpickerg.cpp"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\src\generic\fontpickerg.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\graphicc.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\headerctrlg.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\infobar.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\generic\listbkg.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\generic\listbkg.cpp"\r
                                 >\r
@@ -2600,72 +3748,88 @@
                                 RelativePath="..\..\src\generic\listctrl.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\src\generic\listctrl.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\generic_listctrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\generic_listctrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                         ExcludedFromBuild="true"\r
                                 />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\generic_listctrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\generic_listctrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\generic\logg.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\generic\logg.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\generic\mdig.cpp"\r
+                               RelativePath="..\..\src\generic\markuptext.cpp"\r
                                 >\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\generic\msgdlgg.cpp"\r
+                               RelativePath="..\..\src\generic\mdig.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\generic\numdlgg.cpp"\r
+                               RelativePath="..\..\src\generic\msgdlgg.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\generic\panelg.cpp"\r
+                               RelativePath="..\..\src\generic\numdlgg.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
@@ -2684,6 +3848,10 @@
                                 RelativePath="..\..\src\generic\renderg.cpp"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\src\generic\renderg.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\richmsgdlgg.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\generic\scrlwing.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\generic\scrlwing.cpp"\r
                                 >\r
@@ -2716,39 +3884,51 @@
                                 RelativePath="..\..\src\generic\statusbr.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\src\generic\statusbr.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\generic_statusbr.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\generic_statusbr.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                         Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\tabg.cpp"\r
-                               >\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\generic_statusbr.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\generic_statusbr.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
@@ -2789,159 +3969,383 @@
                                 RelativePath="..\..\src\univ\bmpbuttn.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\src\univ\bmpbuttn.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_bmpbuttn.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_bmpbuttn.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                         ExcludedFromBuild="true"\r
                                 />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_bmpbuttn.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_bmpbuttn.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\button.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\button.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_button.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_button.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                         ExcludedFromBuild="true"\r
                                 />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_button.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_button.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\checkbox.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\checkbox.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_checkbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_checkbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                         ExcludedFromBuild="true"\r
                                 />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_checkbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_checkbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\checklst.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\checklst.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_checklst.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_checklst.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                         ExcludedFromBuild="true"\r
                                 />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_checklst.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_checklst.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\choice.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\choice.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_choice.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_choice.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                         ExcludedFromBuild="true"\r
                                 />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_choice.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_choice.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\combobox.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\combobox.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                         ExcludedFromBuild="true"\r
                                 />\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_combobox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_combobox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                         Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
                                         Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_combobox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_combobox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\control.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\control.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_control.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_control.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                         ExcludedFromBuild="true"\r
                                 />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_control.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_control.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\ctrlrend.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\ctrlrend.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
@@ -2949,39 +4353,71 @@
                                 RelativePath="..\..\src\univ\dialog.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\src\univ\dialog.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_dialog.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_dialog.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                         ExcludedFromBuild="true"\r
                                 />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_dialog.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_dialog.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\framuniv.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\framuniv.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
@@ -2989,39 +4425,71 @@
                                 RelativePath="..\..\src\univ\gauge.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\src\univ\gauge.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_gauge.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_gauge.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                         ExcludedFromBuild="true"\r
                                 />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_gauge.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_gauge.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\themes\gtk.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\themes\gtk.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
@@ -3029,19 +4497,19 @@
                                 RelativePath="..\..\src\univ\inpcons.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\src\univ\inpcons.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
@@ -3049,19 +4517,19 @@
                                 RelativePath="..\..\src\univ\inphand.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\src\univ\inphand.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
@@ -3069,59 +4537,123 @@
                                 RelativePath="..\..\src\univ\listbox.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\src\univ\listbox.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_listbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_listbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                         ExcludedFromBuild="true"\r
                                 />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_listbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_listbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\menu.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\menu.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_menu.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_menu.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                         ExcludedFromBuild="true"\r
                                 />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_menu.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_menu.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\themes\metal.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\themes\metal.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
@@ -3129,19 +4661,19 @@
                                 RelativePath="..\..\src\univ\themes\mono.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\src\univ\themes\mono.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
@@ -3149,79 +4681,175 @@
                                 RelativePath="..\..\src\univ\notebook.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\src\univ\notebook.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_notebook.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_notebook.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                         ExcludedFromBuild="true"\r
                                 />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_notebook.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_notebook.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\radiobox.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\radiobox.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_radiobox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_radiobox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                         ExcludedFromBuild="true"\r
                                 />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_radiobox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_radiobox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\radiobut.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\radiobut.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_radiobut.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_radiobut.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                         ExcludedFromBuild="true"\r
                                 />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_radiobut.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_radiobut.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\scrarrow.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\scrarrow.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
@@ -3229,39 +4857,71 @@
                                 RelativePath="..\..\src\univ\scrolbar.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\src\univ\scrolbar.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_scrolbar.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_scrolbar.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                         ExcludedFromBuild="true"\r
                                 />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_scrolbar.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_scrolbar.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\scrthumb.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\scrthumb.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
@@ -3269,19 +4929,19 @@
                                 RelativePath="..\..\src\univ\settingsuniv.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\src\univ\settingsuniv.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
@@ -3289,159 +4949,383 @@
                                 RelativePath="..\..\src\univ\slider.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\src\univ\slider.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_slider.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_slider.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                         ExcludedFromBuild="true"\r
                                 />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_slider.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_slider.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\spinbutt.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\spinbutt.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_spinbutt.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_spinbutt.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                         ExcludedFromBuild="true"\r
                                 />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_spinbutt.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_spinbutt.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\statbmp.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\statbmp.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                         ExcludedFromBuild="true"\r
                                 />\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_statbmp.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_statbmp.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                         Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
                                         Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_statbmp.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_statbmp.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\statbox.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\statbox.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_statbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_statbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                         ExcludedFromBuild="true"\r
                                 />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_statbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_statbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\statline.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\statline.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_statline.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_statline.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                         ExcludedFromBuild="true"\r
                                 />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_statline.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_statline.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\stattext.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\stattext.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_stattext.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_stattext.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                         ExcludedFromBuild="true"\r
                                 />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_stattext.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_stattext.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\statusbr.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\statusbr.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_statusbr.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_statusbr.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                         ExcludedFromBuild="true"\r
                                 />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_statusbr.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_statusbr.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\stdrend.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\stdrend.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
@@ -3449,59 +5333,123 @@
                                 RelativePath="..\..\src\univ\textctrl.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\src\univ\textctrl.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_textctrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_textctrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                         ExcludedFromBuild="true"\r
                                 />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_textctrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_textctrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\tglbtn.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\tglbtn.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_tglbtn.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_tglbtn.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                         ExcludedFromBuild="true"\r
                                 />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_tglbtn.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_tglbtn.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\theme.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\theme.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
@@ -3509,39 +5457,71 @@
                                 RelativePath="..\..\src\univ\toolbar.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\src\univ\toolbar.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_toolbar.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_toolbar.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                         ExcludedFromBuild="true"\r
                                 />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_toolbar.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_toolbar.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\topluniv.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\topluniv.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
@@ -3549,19 +5529,19 @@
                                 RelativePath="..\..\src\univ\themes\win32.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\src\univ\themes\win32.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
@@ -3569,19 +5549,19 @@
                                 RelativePath="..\..\src\univ\winuniv.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\src\univ\winuniv.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
@@ -3594,121 +5574,113 @@
                                 RelativePath="..\..\include\wx\msw\setup.h"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\include\wx\msw\setup.h"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswu\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswud\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswud\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswu\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                 />\r
                                 <FileConfiguration\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                 />\r
                                 <FileConfiguration\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswu\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswud\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswud\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswu\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"\r
                                         />\r
                                 </FileConfiguration>\r
                                         />\r
                                 </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\univ\setup.h"\r
                                 >\r
                                 <FileConfiguration\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\univ\setup.h"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                 />\r
                                 <FileConfiguration\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                 />\r
                                 <FileConfiguration\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
                                         />\r
                                 </FileConfiguration>\r
                                         />\r
                                 </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                               />\r
                         </File>\r
                 </Filter>\r
                 <Filter\r
                         </File>\r
                 </Filter>\r
                 <Filter\r
@@ -3727,6 +5699,10 @@
                                 RelativePath="..\..\include\wx\msw\ole\activex.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\msw\ole\activex.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\anybutton.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\app.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\app.h"\r
                                 >\r
@@ -3795,6 +5771,10 @@
                                 RelativePath="..\..\include\wx\msw\combobox.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\msw\combobox.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\commandlinkbutton.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\control.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\control.h"\r
                                 >\r
@@ -3807,6 +5787,10 @@
                                 RelativePath="..\..\include\wx\msw\cursor.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\msw\cursor.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\custombgwin.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\ole\dataform.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\ole\dataform.h"\r
                                 >\r
@@ -3820,11 +5804,11 @@
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\msw\datecontrols.h"\r
+                               RelativePath="..\..\include\wx\msw\datectrl.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\msw\datectrl.h"\r
+                               RelativePath="..\..\include\wx\msw\datetimectrl.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
@@ -3911,91 +5895,91 @@
                                 RelativePath="..\..\include\wx\msw\genrcdefs.h"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\include\wx\msw\genrcdefs.h"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivu\wx\msw&quot;"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswud\wx\msw&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivud\wx\msw&quot;"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswu\wx\msw&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswu\wx\msw&quot;"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivud\wx\msw&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswud\wx\msw&quot;"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivu\wx\msw&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivu\wx\msw&quot;"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswud\wx\msw&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivud\wx\msw&quot;"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswu\wx\msw&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswu\wx\msw&quot;"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivud\wx\msw&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswud\wx\msw&quot;"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivu\wx\msw&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                         </File>\r
                                         />\r
                                 </FileConfiguration>\r
                         </File>\r
@@ -4003,6 +5987,10 @@
                                 RelativePath="..\..\include\wx\msw\glcanvas.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\msw\glcanvas.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\headerctrl.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\helpbest.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\helpbest.h"\r
                                 >\r
@@ -4019,6 +6007,10 @@
                                 RelativePath="..\..\include\wx\msw\htmlhelp.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\msw\htmlhelp.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\hyperlink.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\icon.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\icon.h"\r
                                 >\r
@@ -4031,6 +6023,10 @@
                                 RelativePath="..\..\include\wx\msw\iniconf.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\msw\iniconf.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\init.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\joystick.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\joystick.h"\r
                                 >\r
@@ -4075,6 +6071,10 @@
                                 RelativePath="..\..\include\wx\msw\msvcrt.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\msw\msvcrt.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\nonownedwnd.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\notebook.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\notebook.h"\r
                                 >\r
@@ -4087,10 +6087,18 @@
                                 RelativePath="..\..\include\wx\msw\ole\oleutils.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\msw\ole\oleutils.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\ownerdrw.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\palette.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\palette.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\panel.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\pen.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\pen.h"\r
                                 >\r
@@ -4107,6 +6115,10 @@
                                 RelativePath="..\..\include\wx\msw\printwin.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\msw\printwin.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\progdlg.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\radiobox.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\radiobox.h"\r
                                 >\r
@@ -4124,11 +6136,11 @@
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\msw\scrolbar.h"\r
+                               RelativePath="..\..\include\wx\msw\richmsgdlg.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\msw\setup0.h"\r
+                               RelativePath="..\..\include\wx\msw\scrolbar.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
@@ -4167,10 +6179,6 @@
                                 RelativePath="..\..\include\wx\msw\statusbar.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\msw\statusbar.h"\r
                                 >\r
                         </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\msw\tabctrl.h"\r
-                               >\r
-                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\taskbar.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\taskbar.h"\r
                                 >\r
@@ -4187,6 +6195,10 @@
                                 RelativePath="..\..\include\wx\msw\tglbtn.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\msw\tglbtn.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\timectrl.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\toolbar.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\toolbar.h"\r
                                 >\r
@@ -4215,6 +6227,14 @@
                                 RelativePath="..\..\include\wx\msw\uxthemep.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\msw\uxthemep.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\webview_ie.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\webviewhistoryitem_ie.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\window.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\window.h"\r
                                 >\r
@@ -4276,6 +6296,10 @@
                                 RelativePath="..\..\include\wx\generic\ctrlsub.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\generic\ctrlsub.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\custombgwin.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\dataview.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\dataview.h"\r
                                 >\r
@@ -4300,6 +6324,14 @@
                                 RelativePath="..\..\include\wx\generic\dragimgg.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\generic\dragimgg.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\dvrenderer.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\dvrenderers.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\fdrepdlg.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\fdrepdlg.h"\r
                                 >\r
@@ -4332,10 +6364,18 @@
                                 RelativePath="..\..\include\wx\generic\gridctrl.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\generic\gridctrl.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\grideditors.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\gridsel.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\gridsel.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\headerctrlg.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\helpext.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\helpext.h"\r
                                 >\r
@@ -4344,6 +6384,10 @@
                                 RelativePath="..\..\include\wx\generic\hyperlink.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\generic\hyperlink.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\infobar.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\laywin.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\laywin.h"\r
                                 >\r
@@ -4396,6 +6440,10 @@
                                 RelativePath="..\..\include\wx\generic\propdlg.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\generic\propdlg.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\richmsgdlgg.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\sashwin.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\sashwin.h"\r
                                 >\r
@@ -4433,11 +6481,11 @@
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\generic\tabg.h"\r
+                               RelativePath="..\..\include\wx\generic\textdlgg.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\generic\textdlgg.h"\r
+                               RelativePath="..\..\include\wx\generic\timectrl.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
@@ -4453,6 +6501,10 @@
                         Name="wxUniv Headers"\r
                         UniqueIdentifier="{46168D7C-2783-50F3-AE9D-A740D5FF0B44}"\r
                         >\r
                         Name="wxUniv Headers"\r
                         UniqueIdentifier="{46168D7C-2783-50F3-AE9D-A740D5FF0B44}"\r
                         >\r
+                       <File\r
+                               RelativePath="..\..\include\wx\univ\anybutton.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\univ\app.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\univ\app.h"\r
                                 >\r
@@ -4493,6 +6545,10 @@
                                 RelativePath="..\..\include\wx\univ\control.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\univ\control.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\univ\custombgwin.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\univ\dialog.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\univ\dialog.h"\r
                                 >\r
@@ -4529,6 +6585,10 @@
                                 RelativePath="..\..\include\wx\univ\notebook.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\univ\notebook.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\univ\panel.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\univ\radiobox.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\univ\radiobox.h"\r
                                 >\r
@@ -4674,6 +6734,10 @@
                                 RelativePath="..\..\include\wx\html\m_templ.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\html\m_templ.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\html\styleparams.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\html\winpars.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\html\winpars.h"\r
                                 >\r
@@ -4699,6 +6763,14 @@
                                 RelativePath="..\..\include\wx\propgrid\advprops.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\propgrid\advprops.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\affinematrix2d.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\affinematrix2dbase.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\anidecod.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\anidecod.h"\r
                                 >\r
@@ -4711,6 +6783,18 @@
                                 RelativePath="..\..\include\wx\animdecod.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\animdecod.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\anybutton.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\ribbon\art.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\ribbon\art_internal.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\artprov.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\artprov.h"\r
                                 >\r
@@ -4727,6 +6811,14 @@
                                 RelativePath="..\..\include\wx\aui\auibook.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\aui\auibook.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\bannerwindow.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\ribbon\bar.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\bitmap.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\bitmap.h"\r
                                 >\r
@@ -4743,6 +6835,10 @@
                                 RelativePath="..\..\include\wx\bookctrl.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\bookctrl.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\persist\bookctrl.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\brush.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\brush.h"\r
                                 >\r
@@ -4755,6 +6851,10 @@
                                 RelativePath="..\..\include\wx\button.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\button.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\ribbon\buttonbar.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\cairo.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\cairo.h"\r
                                 >\r
@@ -4815,6 +6915,10 @@
                                 RelativePath="..\..\include\wx\colour.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\colour.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\colourdata.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\combo.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\combo.h"\r
                                 >\r
@@ -4823,10 +6927,22 @@
                                 RelativePath="..\..\include\wx\combobox.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\combobox.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\commandlinkbutton.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\compositewin.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\control.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\control.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\ribbon\control.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\cshelp.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\cshelp.h"\r
                                 >\r
@@ -4839,6 +6955,10 @@
                                 RelativePath="..\..\include\wx\cursor.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\cursor.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\custombgwin.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\dataobj.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\dataobj.h"\r
                                 >\r
@@ -4855,6 +6975,10 @@
                                 RelativePath="..\..\include\wx\dateevt.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\dateevt.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\datetimectrl.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\dc.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\dc.h"\r
                                 >\r
@@ -4943,6 +7067,10 @@
                                 RelativePath="..\..\include\wx\dragimag.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\dragimag.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\dvrenderers.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\editlbox.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\editlbox.h"\r
                                 >\r
@@ -4960,7 +7088,7 @@
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\evtloop.h"\r
+                               RelativePath="..\..\include\wx\evtloopsrc.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
@@ -4975,6 +7103,10 @@
                                 RelativePath="..\..\include\wx\filedlg.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\filedlg.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\filehistory.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\filepicker.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\filepicker.h"\r
                                 >\r
@@ -4991,6 +7123,10 @@
                                 RelativePath="..\..\include\wx\font.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\font.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\fontdata.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\fontdlg.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\fontdlg.h"\r
                                 >\r
@@ -5015,6 +7151,10 @@
                                 RelativePath="..\..\include\wx\aui\framemanager.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\aui\framemanager.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\ribbon\gallery.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\gauge.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\gauge.h"\r
                                 >\r
@@ -5051,6 +7191,14 @@
                                 RelativePath="..\..\include\wx\grid.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\grid.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\headercol.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\headerctrl.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\help.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\help.h"\r
                                 >\r
@@ -5131,6 +7279,14 @@
                                 RelativePath="..\..\include\wx\imagxpm.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\imagxpm.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\infobar.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\itemid.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\joystick.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\joystick.h"\r
                                 >\r
@@ -5191,6 +7347,10 @@
                                 RelativePath="..\..\include\wx\minifram.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\minifram.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\mousemanager.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msgdlg.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\msgdlg.h"\r
                                 >\r
@@ -5227,6 +7387,10 @@
                                 RelativePath="..\..\include\wx\ownerdrw.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\ownerdrw.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\ribbon\page.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\palette.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\palette.h"\r
                                 >\r
@@ -5235,6 +7399,10 @@
                                 RelativePath="..\..\include\wx\panel.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\panel.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\ribbon\panel.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\paper.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\paper.h"\r
                                 >\r
@@ -5243,6 +7411,10 @@
                                 RelativePath="..\..\include\wx\pen.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\pen.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\persist.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\pickerbase.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\pickerbase.h"\r
                                 >\r
@@ -5311,10 +7483,18 @@
                                 RelativePath="..\..\include\wx\radiobut.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\radiobut.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\range.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\rawbmp.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\rawbmp.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\rearrangectrl.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\region.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\region.h"\r
                                 >\r
@@ -5323,14 +7503,38 @@
                                 RelativePath="..\..\include\wx\renderer.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\renderer.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richmsgdlg.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextbackgroundpage.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextborderspage.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextbuffer.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextbuffer.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextbulletspage.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextctrl.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextctrl.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextdialogpage.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextfontpage.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextformatdlg.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextformatdlg.h"\r
                                 >\r
@@ -5339,14 +7543,38 @@
                                 RelativePath="..\..\include\wx\richtext\richtexthtml.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\richtext\richtexthtml.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextimagedlg.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextindentspage.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextliststylepage.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextmarginspage.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextprint.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextprint.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextsizepage.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextstyledlg.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextstyledlg.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextstylepage.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextstyles.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextstyles.h"\r
                                 >\r
@@ -5355,10 +7583,18 @@
                                 RelativePath="..\..\include\wx\richtext\richtextsymboldlg.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\richtext\richtextsymboldlg.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextuicustomization.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextxml.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextxml.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtooltip.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\sashwin.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\sashwin.h"\r
                                 >\r
@@ -5407,6 +7643,10 @@
                                 RelativePath="..\..\include\wx\splash.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\splash.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\persist\splitter.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\splitter.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\splitter.h"\r
                                 >\r
@@ -5440,11 +7680,7 @@
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\tab.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\tabctrl.h"\r
+                               RelativePath="..\..\include\wx\aui\tabart.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
@@ -5459,6 +7695,10 @@
                                 RelativePath="..\..\include\wx\tbarbase.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\tbarbase.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\textcompleter.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\textctrl.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\textctrl.h"\r
                                 >\r
@@ -5471,10 +7711,18 @@
                                 RelativePath="..\..\include\wx\textentry.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\textentry.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\textwrapper.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\tglbtn.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\tglbtn.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\timectrl.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\tipdlg.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\tipdlg.h"\r
                                 >\r
@@ -5483,6 +7731,10 @@
                                 RelativePath="..\..\include\wx\tipwin.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\tipwin.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\ribbon\toolbar.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\toolbar.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\toolbar.h"\r
                                 >\r
@@ -5495,6 +7747,10 @@
                                 RelativePath="..\..\include\wx\tooltip.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\tooltip.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\persist\toplevel.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\toplevel.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\toplevel.h"\r
                                 >\r
@@ -5503,6 +7759,10 @@
                                 RelativePath="..\..\include\wx\treebase.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\treebase.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\persist\treebook.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\treebook.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\treebook.h"\r
                                 >\r
@@ -5511,6 +7771,14 @@
                                 RelativePath="..\..\include\wx\treectrl.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\treectrl.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\treelist.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\uiaction.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\valgen.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\valgen.h"\r
                                 >\r
@@ -5519,6 +7787,10 @@
                                 RelativePath="..\..\include\wx\validate.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\validate.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\valnum.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\valtext.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\valtext.h"\r
                                 >\r
@@ -5539,6 +7811,18 @@
                                 RelativePath="..\..\include\wx\vscroll.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\vscroll.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\webview.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\webviewarchivehandler.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\persist\window.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\window.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\window.h"\r
                                 >\r
@@ -5547,6 +7831,10 @@
                                 RelativePath="..\..\include\wx\windowid.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\windowid.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\withimages.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\wizard.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\wizard.h"\r
                                 >\r
@@ -5571,6 +7859,10 @@
                                 RelativePath="..\..\include\wx\xrc\xh_animatctrl.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\xrc\xh_animatctrl.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_bannerwindow.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_bmp.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_bmp.h"\r
                                 >\r
@@ -5611,6 +7903,10 @@
                                 RelativePath="..\..\include\wx\xrc\xh_clrpicker.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\xrc\xh_clrpicker.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_cmdlinkbn.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_collpane.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_collpane.h"\r
                                 >\r
@@ -5619,6 +7915,10 @@
                                 RelativePath="..\..\include\wx\xrc\xh_combo.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\xrc\xh_combo.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_comboctrl.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_datectrl.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_datectrl.h"\r
                                 >\r
@@ -5631,6 +7931,14 @@
                                 RelativePath="..\..\include\wx\xrc\xh_dlg.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\xrc\xh_dlg.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_editlbox.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_filectrl.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_filepicker.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_filepicker.h"\r
                                 >\r
@@ -5767,10 +8075,18 @@
                                 RelativePath="..\..\include\wx\xrc\xh_tglbtn.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\xrc\xh_tglbtn.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_timectrl.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_toolb.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_toolb.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_toolbk.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_tree.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_tree.h"\r
                                 >\r