Interface fixes for Phoenix

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

index 3f5f810179a238b9d959cb3ff8054ab4aaaba54a..3eddaa9b423ff71b8824b067cb3161ac97368aa4 100644 (file)
--- a/build/msw/wx_vc7_core.vcproj
+++ b/build/msw/wx_vc7_core.vcproj
@@ -1,8 +1,8 @@
  <?xml version="1.0" encoding="Windows-1252"?>\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
@@ -17,27 +17,86 @@
         </Platforms>\r
         <Configurations>\r
                 <Configuration\r
         </Platforms>\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
+                       <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;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
+                               UsePrecompiledHeader="3"\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
+                       <Tool\r
+                               Name="VCCustomBuildTool"/>\r
+                       <Tool\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxmsw29ud_core.lib"\r
+                               SuppressStartupBanner="TRUE"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__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
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"/>\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__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
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"/>\r
+                       <Tool\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\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
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\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;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
                                 ExceptionHandling="TRUE"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 ExceptionHandling="TRUE"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\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
@@ -45,19 +104,13 @@
                         <Tool\r
                                 Name="VCCustomBuildTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCCustomBuildTool"/>\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
-                               SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb"\r
-                               TargetMachine="1"/>\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxmsw29u_core.lib"\r
+                               SuppressStartupBanner="TRUE"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;__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
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -66,9 +119,9 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="__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
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
@@ -81,18 +134,18 @@
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\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
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\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;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
                                 MinimalRebuild="TRUE"\r
                                 ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
                                 MinimalRebuild="TRUE"\r
                                 ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
@@ -101,10 +154,9 @@
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\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
@@ -112,19 +164,13 @@
                         <Tool\r
                                 Name="VCCustomBuildTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCCustomBuildTool"/>\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
-                               SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb"\r
-                               TargetMachine="1"/>\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_core.lib"\r
+                               SuppressStartupBanner="TRUE"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__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
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -133,9 +179,9 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                                 Name="VCPreLinkEventTool"/>\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;__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
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
@@ -148,27 +194,26 @@
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\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
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\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;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
                                 ExceptionHandling="TRUE"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 ExceptionHandling="TRUE"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\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
@@ -176,19 +221,13 @@
                         <Tool\r
                                 Name="VCCustomBuildTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCCustomBuildTool"/>\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
-                               SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb"\r
-                               TargetMachine="1"/>\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxmswuniv29u_core.lib"\r
+                               SuppressStartupBanner="TRUE"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;__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
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -197,9 +236,9 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="__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
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
@@ -223,7 +262,7 @@
                                 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
                                 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;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
                                 MinimalRebuild="TRUE"\r
                                 ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
                                 MinimalRebuild="TRUE"\r
                                 ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
@@ -233,9 +272,8 @@
                                 UsePrecompiledHeader="3"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 PrecompiledHeaderFile="vc_mswuddll\wxprec_coredll.pch"\r
                                 UsePrecompiledHeader="3"\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
@@ -245,17 +283,19 @@
                         <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
                                 GenerateDebugInformation="TRUE"\r
                                 LinkIncremental="2"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_core.lib"\r
                                 SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\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
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__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
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -264,7 +304,7 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                                 Name="VCPreLinkEventTool"/>\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;__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
                         <Tool\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
                         <Tool\r
@@ -279,27 +319,26 @@
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\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
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\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;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
                                 ExceptionHandling="TRUE"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 ExceptionHandling="TRUE"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\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
@@ -307,11 +346,23 @@
                         <Tool\r
                                 Name="VCCustomBuildTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCCustomBuildTool"/>\r
                         <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmswuniv29u_core.lib"\r
-                               SuppressStartupBanner="TRUE"/>\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
+                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+                               GenerateDebugInformation="TRUE"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294u_core_vc_custom.pdb"\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__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
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -320,9 +371,9 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="__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
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
@@ -335,18 +386,18 @@
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\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
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\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;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
                                 MinimalRebuild="TRUE"\r
                                 ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
                                 MinimalRebuild="TRUE"\r
                                 ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
@@ -355,10 +406,9 @@
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\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
@@ -366,11 +416,21 @@
                         <Tool\r
                                 Name="VCCustomBuildTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCCustomBuildTool"/>\r
                         <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_core.lib"\r
-                               SuppressStartupBanner="TRUE"/>\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
+                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+                               GenerateDebugInformation="TRUE"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294ud_core_vc_custom.pdb"\r
+                               TargetMachine="1"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__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
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -379,9 +439,9 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="_DEBUG;__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
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
@@ -394,27 +454,26 @@
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\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
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\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;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
                                 ExceptionHandling="TRUE"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 ExceptionHandling="TRUE"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\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
@@ -422,11 +481,23 @@
                         <Tool\r
                                 Name="VCCustomBuildTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCCustomBuildTool"/>\r
                         <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmsw29u_core.lib"\r
-                               SuppressStartupBanner="TRUE"/>\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
+                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+                               GenerateDebugInformation="TRUE"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294u_core_vc_custom.pdb"\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__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
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -435,68 +506,9 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="__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
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
-                       <Tool\r
-                               Name="VCManagedWrapperGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\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
-                       <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="TRUE"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="TRUE"\r
-                               RuntimeTypeInfo="TRUE"\r
-                               UsePrecompiledHeader="3"\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
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmsw29ud_core.lib"\r
-                               SuppressStartupBanner="TRUE"/>\r
-                       <Tool\r
-                               Name="VCMIDLTool"/>\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\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
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
@@ -522,6 +534,9 @@
                         <File\r
                                 RelativePath="..\..\src\common\accesscmn.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\accesscmn.cpp">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\affinematrix2d.cpp">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\anidecod.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\anidecod.cpp">\r
                         </File>\r
@@ -534,9 +549,15 @@
                         <File\r
                                 RelativePath="..\..\src\common\artstd.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\artstd.cpp">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\arttango.cpp">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\bmpbase.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\bmpbase.cpp">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\bmpbtncmn.cpp">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\bookctrl.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\bookctrl.cpp">\r
                         </File>\r
@@ -546,6 +567,12 @@
                         <File\r
                                 RelativePath="..\..\src\common\cairo.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\cairo.cpp">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\checkboxcmn.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\checklstcmn.cpp">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\choiccmn.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\choiccmn.cpp">\r
                         </File>\r
@@ -564,6 +591,9 @@
                         <File\r
                                 RelativePath="..\..\src\common\colourcmn.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\colourcmn.cpp">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\colourdata.cpp">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\combocmn.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\combocmn.cpp">\r
                         </File>\r
@@ -579,9 +609,6 @@
                         <File\r
                                 RelativePath="..\..\src\common\ctrlsub.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\ctrlsub.cpp">\r
                         </File>\r
-                       <File\r
-                               RelativePath="..\..\src\common\datacmn.cpp">\r
-                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\dcbase.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\dcbase.cpp">\r
                         </File>\r
@@ -594,6 +621,9 @@
                         <File\r
                                 RelativePath="..\..\src\common\dcsvg.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\dcsvg.cpp">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\dirctrlcmn.cpp">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\dlgcmn.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\dlgcmn.cpp">\r
                         </File>\r
@@ -618,49 +648,49 @@
                         <File\r
                                 RelativePath="..\..\src\common\dummy.cpp">\r
                                 <FileConfiguration\r
                         <File\r
                                 RelativePath="..\..\src\common\dummy.cpp">\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32">\r
+                                       Name="Debug|Win32">\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32">\r
+                                       Name="Release|Win32">\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32">\r
+                                       Name="Universal Debug|Win32">\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32">\r
+                                       Name="Universal Release|Win32">\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32">\r
+                                       Name="DLL Debug|Win32">\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32">\r
+                                       Name="DLL Release|Win32">\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32">\r
+                                       Name="DLL Universal Debug|Win32">\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32">\r
+                                       Name="DLL Universal Release|Win32">\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
@@ -678,6 +708,9 @@
                         <File\r
                                 RelativePath="..\..\src\common\filectrlcmn.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\filectrlcmn.cpp">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\filehistorycmn.cpp">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\filepickercmn.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\filepickercmn.cpp">\r
                         </File>\r
@@ -687,6 +720,9 @@
                         <File\r
                                 RelativePath="..\..\src\common\fontcmn.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\fontcmn.cpp">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\fontdata.cpp">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\fontenumcmn.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\fontenumcmn.cpp">\r
                         </File>\r
@@ -783,12 +819,18 @@
                         <File\r
                                 RelativePath="..\..\src\common\listctrlcmn.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\listctrlcmn.cpp">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\markupparser.cpp">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\matrix.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\menucmn.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\matrix.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\menucmn.cpp">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\mousemanager.cpp">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\msgout.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\msgout.cpp">\r
                         </File>\r
@@ -798,9 +840,18 @@
                         <File\r
                                 RelativePath="..\..\src\common\overlaycmn.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\overlaycmn.cpp">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\ownerdrwcmn.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\panelcmn.cpp">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\paper.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\paper.cpp">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\persist.cpp">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\pickerbase.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\pickerbase.cpp">\r
                         </File>\r
@@ -813,27 +864,54 @@
                         <File\r
                                 RelativePath="..\..\src\common\quantize.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\quantize.cpp">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\radiobtncmn.cpp">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\radiocmn.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\radiocmn.cpp">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\rearrangectrl.cpp">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\rendcmn.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\rgncmn.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\rendcmn.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\rgncmn.cpp">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\scrolbarcmn.cpp">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\settcmn.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\sizer.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\settcmn.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\sizer.cpp">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\slidercmn.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\spinbtncmn.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\spinctrlcmn.cpp">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\srchcmn.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\statbar.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\srchcmn.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\statbar.cpp">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\statbmpcmn.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\statboxcmn.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\statlinecmn.cpp">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\stattextcmn.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\stattextcmn.cpp">\r
                         </File>\r
@@ -855,6 +933,9 @@
                         <File\r
                                 RelativePath="..\..\src\common\treebase.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\treebase.cpp">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\uiactioncmn.cpp">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\utilscmn.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\utilscmn.cpp">\r
                         </File>\r
@@ -864,6 +945,9 @@
                         <File\r
                                 RelativePath="..\..\src\common\validate.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\validate.cpp">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\valnum.cpp">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\valtext.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\valtext.cpp">\r
                         </File>\r
@@ -886,32 +970,74 @@
                         <File\r
                                 RelativePath="..\..\src\msw\accel.cpp">\r
                                 <FileConfiguration\r
                         <File\r
                                 RelativePath="..\..\src\msw\accel.cpp">\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_accel.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_accel.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_accel.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_accel.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\ole\access.cpp">\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\ole\access.cpp">\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                         ExcludedFromBuild="TRUE"/>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\ole\activex.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\anybutton.cpp">\r
                                 <FileConfiguration\r
                                         Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\app.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\app.cpp">\r
@@ -919,16 +1045,16 @@
                         <File\r
                                 RelativePath="..\..\src\msw\artmsw.cpp">\r
                                 <FileConfiguration\r
                         <File\r
                                 RelativePath="..\..\src\msw\artmsw.cpp">\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
@@ -940,16 +1066,40 @@
                         <File\r
                                 RelativePath="..\..\src\msw\bmpbuttn.cpp">\r
                                 <FileConfiguration\r
                         <File\r
                                 RelativePath="..\..\src\msw\bmpbuttn.cpp">\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_bmpbuttn.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_bmpbuttn.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_bmpbuttn.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_bmpbuttn.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
@@ -958,16 +1108,40 @@
                         <File\r
                                 RelativePath="..\..\src\msw\button.cpp">\r
                                 <FileConfiguration\r
                         <File\r
                                 RelativePath="..\..\src\msw\button.cpp">\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_button.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_button.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_button.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_button.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
@@ -976,47 +1150,119 @@
                         <File\r
                                 RelativePath="..\..\src\msw\checkbox.cpp">\r
                                 <FileConfiguration\r
                         <File\r
                                 RelativePath="..\..\src\msw\checkbox.cpp">\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_checkbox.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_checkbox.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\checklst.cpp">\r
+                                       Name="DLL Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_checkbox.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="DLL Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_checkbox.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                         Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
                                         Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\choice.cpp">\r
+                               RelativePath="..\..\src\msw\checklst.cpp">\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_checklst.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_checklst.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="DLL Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_checklst.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_checklst.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\choice.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_choice.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_choice.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_choice.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_choice.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\clipbrd.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\clipbrd.cpp">\r
@@ -1024,16 +1270,16 @@
                         <File\r
                                 RelativePath="..\..\src\msw\colordlg.cpp">\r
                                 <FileConfiguration\r
                         <File\r
                                 RelativePath="..\..\src\msw\colordlg.cpp">\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
@@ -1042,46 +1288,94 @@
                         <File\r
                                 RelativePath="..\..\src\msw\combo.cpp">\r
                                 <FileConfiguration\r
                         <File\r
                                 RelativePath="..\..\src\msw\combo.cpp">\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\combobox.cpp">\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\combobox.cpp">\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_combobox.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_combobox.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_combobox.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_combobox.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\control.cpp">\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\control.cpp">\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_control.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_control.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_control.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_control.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
@@ -1111,16 +1405,40 @@
                         <File\r
                                 RelativePath="..\..\src\msw\dialog.cpp">\r
                                 <FileConfiguration\r
                         <File\r
                                 RelativePath="..\..\src\msw\dialog.cpp">\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_dialog.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_dialog.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_dialog.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_dialog.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
@@ -1132,16 +1450,16 @@
                         <File\r
                                 RelativePath="..\..\src\msw\dirdlg.cpp">\r
                                 <FileConfiguration\r
                         <File\r
                                 RelativePath="..\..\src\msw\dirdlg.cpp">\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
@@ -1150,16 +1468,16 @@
                         <File\r
                                 RelativePath="..\..\src\msw\dragimag.cpp">\r
                                 <FileConfiguration\r
                         <File\r
                                 RelativePath="..\..\src\msw\dragimag.cpp">\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
@@ -1177,31 +1495,55 @@
                         <File\r
                                 RelativePath="..\..\src\msw\fdrepdlg.cpp">\r
                                 <FileConfiguration\r
                         <File\r
                                 RelativePath="..\..\src\msw\fdrepdlg.cpp">\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_fdrepdlg.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_fdrepdlg.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_fdrepdlg.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_fdrepdlg.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\filedlg.cpp">\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\filedlg.cpp">\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
@@ -1210,16 +1552,16 @@
                         <File\r
                                 RelativePath="..\..\src\msw\fontdlg.cpp">\r
                                 <FileConfiguration\r
                         <File\r
                                 RelativePath="..\..\src\msw\fontdlg.cpp">\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
@@ -1231,31 +1573,55 @@
                         <File\r
                                 RelativePath="..\..\src\msw\frame.cpp">\r
                                 <FileConfiguration\r
                         <File\r
                                 RelativePath="..\..\src\msw\frame.cpp">\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\gauge.cpp">\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\gauge.cpp">\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_gauge.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_gauge.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_gauge.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_gauge.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
@@ -1271,33 +1637,18 @@
                                 RelativePath="..\..\src\msw\graphics.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\graphics.cpp">\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\headercol.cpp">\r
+                               RelativePath="..\..\src\msw\headerctrl.cpp">\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\headerctrl.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
@@ -1315,46 +1666,94 @@
                         <File\r
                                 RelativePath="..\..\src\msw\iniconf.cpp">\r
                                 <FileConfiguration\r
                         <File\r
                                 RelativePath="..\..\src\msw\iniconf.cpp">\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\listbox.cpp">\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\listbox.cpp">\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_listbox.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_listbox.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_listbox.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_listbox.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\listctrl.cpp">\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\listctrl.cpp">\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_listctrl.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_listctrl.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_listctrl.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_listctrl.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
@@ -1363,61 +1762,85 @@
                         <File\r
                                 RelativePath="..\..\src\msw\mdi.cpp">\r
                                 <FileConfiguration\r
                         <File\r
                                 RelativePath="..\..\src\msw\mdi.cpp">\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\menu.cpp">\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\menu.cpp">\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_menu.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_menu.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_menu.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_menu.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\menuitem.cpp">\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\menuitem.cpp">\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\metafile.cpp">\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\metafile.cpp">\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
@@ -1426,16 +1849,16 @@
                         <File\r
                                 RelativePath="..\..\src\msw\msgdlg.cpp">\r
                                 <FileConfiguration\r
                         <File\r
                                 RelativePath="..\..\src\msw\msgdlg.cpp">\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
@@ -1444,46 +1867,73 @@
                         <File\r
                                 RelativePath="..\..\src\msw\nativdlg.cpp">\r
                                 <FileConfiguration\r
                         <File\r
                                 RelativePath="..\..\src\msw\nativdlg.cpp">\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\nativewin.cpp">\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\nativewin.cpp">\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\nonownedwnd.cpp">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\notebook.cpp">\r
                                 <FileConfiguration\r
                         <File\r
                                 RelativePath="..\..\src\msw\notebook.cpp">\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_notebook.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_notebook.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_notebook.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_notebook.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
@@ -1492,21 +1942,36 @@
                         <File\r
                                 RelativePath="..\..\src\msw\ownerdrw.cpp">\r
                                 <FileConfiguration\r
                         <File\r
                                 RelativePath="..\..\src\msw\ownerdrw.cpp">\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\palette.cpp">\r
                         </File>\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\palette.cpp">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\panel.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\pen.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\pen.cpp">\r
                         </File>\r
@@ -1520,500 +1985,869 @@
                                 RelativePath="..\..\src\msw\printwin.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\printwin.cpp">\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\radiobox.cpp">\r
+                               RelativePath="..\..\src\msw\progdlg.cpp">\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\radiobut.cpp">\r
+                               RelativePath="..\..\src\msw\radiobox.cpp">\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_radiobox.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_radiobox.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\region.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\renderer.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\scrolbar.cpp">\r
+                                       Name="DLL Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_radiobox.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="DLL Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_radiobox.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                         Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
                                         Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\settings.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\slider.cpp">\r
+                               RelativePath="..\..\src\msw\radiobut.cpp">\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_radiobut.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_radiobut.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\spinbutt.cpp">\r
+                                       Name="DLL Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_radiobut.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="DLL Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_radiobut.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                         Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
                                         Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\spinctrl.cpp">\r
+                               RelativePath="..\..\src\msw\region.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\renderer.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\richmsgdlg.cpp">\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\statbmp.cpp">\r
+                               RelativePath="..\..\src\msw\scrolbar.cpp">\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_scrolbar.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_scrolbar.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\statbox.cpp">\r
+                                       Name="DLL Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_scrolbar.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="DLL Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_scrolbar.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                         Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
                                         Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\statline.cpp">\r
+                               RelativePath="..\..\src\msw\settings.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\slider.cpp">\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_slider.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_slider.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\stattext.cpp">\r
+                                       Name="DLL Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_slider.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="DLL Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_slider.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                         Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
                                         Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\statusbar.cpp">\r
+                               RelativePath="..\..\src\msw\spinbutt.cpp">\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_spinbutt.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_spinbutt.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\tabctrl.cpp">\r
+                                       Name="DLL Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_spinbutt.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="DLL Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_spinbutt.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                         Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
                                         Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\textctrl.cpp">\r
+                               RelativePath="..\..\src\msw\spinctrl.cpp">\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\textentry.cpp">\r
+                               RelativePath="..\..\src\msw\statbmp.cpp">\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_statbmp.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_statbmp.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\tglbtn.cpp">\r
+                                       Name="DLL Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_statbmp.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="DLL Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_statbmp.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                         Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
                                         Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\toolbar.cpp">\r
+                               RelativePath="..\..\src\msw\statbox.cpp">\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_statbox.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_statbox.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_statbox.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_statbox.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                         ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\tooltip.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\toplevel.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\treectrl.cpp">\r
                                 <FileConfiguration\r
                                         Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\statline.cpp">\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_statline.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_statline.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_statline.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_statline.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\utilsgui.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\ole\uuid.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\uxtheme.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\version.rc">\r
+                               RelativePath="..\..\src\msw\stattext.cpp">\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_stattext.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_stattext.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                         Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
                                         Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_stattext.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_stattext.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\volume.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\window.cpp">\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="Generic Sources"\r
-                       UniqueIdentifier="{FEA0C02F-F300-53BA-B784-52A5086B8093}">\r
-                       <File\r
-                               RelativePath="..\..\src\generic\accel.cpp">\r
+                               RelativePath="..\..\src\msw\statusbar.cpp">\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\generic\busyinfo.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\buttonbar.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\choicbkg.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\choicdgg.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\clrpickerg.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\collpaneg.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\colrdlgg.cpp">\r
+                               RelativePath="..\..\src\msw\textctrl.cpp">\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_textctrl.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_textctrl.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_textctrl.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_textctrl.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\generic\combog.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\dcpsg.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\dirctrlg.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\dirdlgg.cpp">\r
+                               RelativePath="..\..\src\msw\textentry.cpp">\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\generic\dragimgg.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\fdrepdlg.cpp">\r
+                               RelativePath="..\..\src\msw\tglbtn.cpp">\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_tglbtn.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_tglbtn.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_tglbtn.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_tglbtn.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\generic\filectrlg.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\filedlgg.cpp">\r
+                               RelativePath="..\..\src\msw\toolbar.cpp">\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_toolbar.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_toolbar.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_toolbar.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_toolbar.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\generic\filepickerg.cpp">\r
+                               RelativePath="..\..\src\msw\tooltip.cpp">\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\generic\fontdlgg.cpp">\r
+                               RelativePath="..\..\src\msw\toplevel.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\treectrl.cpp">\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\generic\fontpickerg.cpp">\r
+                               RelativePath="..\..\src\msw\uiaction.cpp">\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\generic\headercolg.cpp">\r
+                               RelativePath="..\..\src\msw\utilsgui.cpp">\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\generic\headerctrlg.cpp">\r
+                               RelativePath="..\..\src\msw\ole\uuid.cpp">\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\generic\listbkg.cpp">\r
+                               RelativePath="..\..\src\msw\uxtheme.cpp">\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\generic\listctrl.cpp">\r
+                               RelativePath="..\..\src\msw\version.rc">\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\generic\logg.cpp">\r
+                               RelativePath="..\..\src\msw\volume.cpp">\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\generic\mdig.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                               RelativePath="..\..\src\msw\window.cpp">\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Generic Sources"\r
+                       UniqueIdentifier="{FEA0C02F-F300-53BA-B784-52A5086B8093}">\r
+                       <File\r
+                               RelativePath="..\..\src\generic\accel.cpp">\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\generic_accel.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\generic_accel.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\generic_accel.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\generic_accel.obj"/>\r
+                               </FileConfiguration>\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\generic\msgdlgg.cpp">\r
+                               RelativePath="..\..\src\generic\busyinfo.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\buttonbar.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\choicbkg.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\choicdgg.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\clrpickerg.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\collpaneg.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\colrdlgg.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\combog.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\dcpsg.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\dirctrlg.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\dirdlgg.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\dragimgg.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\fdrepdlg.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\generic_fdrepdlg.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\generic_fdrepdlg.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\generic_fdrepdlg.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\generic_fdrepdlg.obj"/>\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\filectrlg.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\filedlgg.cpp">\r
                                 <FileConfiguration\r
                                         Name="Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\generic\numdlgg.cpp">\r
+                               RelativePath="..\..\src\generic\filepickerg.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\fontdlgg.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\fontpickerg.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\graphicc.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\headerctrlg.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\infobar.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\listbkg.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\listctrl.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\generic_listctrl.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\generic_listctrl.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\generic_listctrl.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\generic_listctrl.obj"/>\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\logg.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\markuptext.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\mdig.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\msgdlgg.cpp">\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\generic\panelg.cpp">\r
+                               RelativePath="..\..\src\generic\numdlgg.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\generic\printps.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\generic\printps.cpp">\r
@@ -2027,6 +2861,9 @@
                         <File\r
                                 RelativePath="..\..\src\generic\renderg.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\generic\renderg.cpp">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\richmsgdlgg.cpp">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\generic\scrlwing.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\generic\scrlwing.cpp">\r
                         </File>\r
@@ -2051,31 +2888,40 @@
                         <File\r
                                 RelativePath="..\..\src\generic\statusbr.cpp">\r
                                 <FileConfiguration\r
                         <File\r
                                 RelativePath="..\..\src\generic\statusbr.cpp">\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\generic_statusbr.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\generic_statusbr.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                         Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\tabg.cpp">\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="DLL Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\generic_statusbr.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\generic_statusbr.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
@@ -2099,608 +2945,1208 @@
                         <File\r
                                 RelativePath="..\..\src\generic\vscroll.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\generic\vscroll.cpp">\r
                         </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="wxUniv Sources"\r
-                       UniqueIdentifier="{6F354595-5EA6-5848-AAA1-6C4820DE7AEE}">\r
+               </Filter>\r
+               <Filter\r
+                       Name="wxUniv Sources"\r
+                       UniqueIdentifier="{6F354595-5EA6-5848-AAA1-6C4820DE7AEE}">\r
+                       <File\r
+                               RelativePath="..\..\src\univ\bmpbuttn.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_bmpbuttn.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_bmpbuttn.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_bmpbuttn.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_bmpbuttn.obj"/>\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\univ\button.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_button.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_button.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_button.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_button.obj"/>\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\univ\checkbox.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_checkbox.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_checkbox.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_checkbox.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_checkbox.obj"/>\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\univ\checklst.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_checklst.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_checklst.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_checklst.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_checklst.obj"/>\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\univ\choice.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_choice.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_choice.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_choice.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_choice.obj"/>\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\univ\combobox.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_combobox.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_combobox.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_combobox.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_combobox.obj"/>\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\univ\control.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_control.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_control.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_control.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_control.obj"/>\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\univ\ctrlrend.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\univ\dialog.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_dialog.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_dialog.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_dialog.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_dialog.obj"/>\r
+                               </FileConfiguration>\r
+                       </File>\r
                         <File\r
                         <File\r
-                               RelativePath="..\..\src\univ\bmpbuttn.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                               RelativePath="..\..\src\univ\framuniv.cpp">\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                         ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\button.cpp">\r
                                 <FileConfiguration\r
                                         Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\univ\gauge.cpp">\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\checkbox.cpp">\r
+                                       Name="Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_gauge.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_gauge.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                         Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
                                         Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="DLL Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_gauge.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_gauge.obj"/>\r
+                               </FileConfiguration>\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\univ\checklst.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                               RelativePath="..\..\src\univ\themes\gtk.cpp">\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                         ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\choice.cpp">\r
                                 <FileConfiguration\r
                                         Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\univ\inpcons.cpp">\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                         ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\combobox.cpp">\r
                                 <FileConfiguration\r
                                         Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\univ\inphand.cpp">\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                         ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\control.cpp">\r
                                 <FileConfiguration\r
                                         Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\univ\listbox.cpp">\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_listbox.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_listbox.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                         ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\ctrlrend.cpp">\r
                                 <FileConfiguration\r
                                         Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
                                         Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="DLL Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_listbox.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_listbox.obj"/>\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\univ\menu.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_menu.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_menu.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                         ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\dialog.cpp">\r
                                 <FileConfiguration\r
                                         Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
                                         Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="DLL Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_menu.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_menu.obj"/>\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\univ\themes\metal.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                         ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\framuniv.cpp">\r
                                 <FileConfiguration\r
                                         Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\univ\themes\mono.cpp">\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                         ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\gauge.cpp">\r
                                 <FileConfiguration\r
                                         Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\univ\notebook.cpp">\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_notebook.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_notebook.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                         ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\themes\gtk.cpp">\r
                                 <FileConfiguration\r
                                         Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
                                         Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="DLL Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_notebook.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_notebook.obj"/>\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\univ\radiobox.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_radiobox.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_radiobox.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                         ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\inpcons.cpp">\r
                                 <FileConfiguration\r
                                         Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
                                         Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="DLL Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_radiobox.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_radiobox.obj"/>\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\univ\radiobut.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_radiobut.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_radiobut.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                         ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\inphand.cpp">\r
                                 <FileConfiguration\r
                                         Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
                                         Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="DLL Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_radiobut.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_radiobut.obj"/>\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\univ\scrarrow.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                         ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\listbox.cpp">\r
                                 <FileConfiguration\r
                                         Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\univ\scrolbar.cpp">\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\menu.cpp">\r
+                                       Name="Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_scrolbar.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_scrolbar.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                         Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
                                         Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="DLL Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_scrolbar.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_scrolbar.obj"/>\r
+                               </FileConfiguration>\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\univ\themes\metal.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                               RelativePath="..\..\src\univ\scrthumb.cpp">\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                         ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\themes\mono.cpp">\r
                                 <FileConfiguration\r
                                         Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\univ\settingsuniv.cpp">\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                         ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\notebook.cpp">\r
                                 <FileConfiguration\r
                                         Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\univ\slider.cpp">\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\radiobox.cpp">\r
+                                       Name="Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_slider.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_slider.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                         Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
                                         Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="DLL Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_slider.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_slider.obj"/>\r
+                               </FileConfiguration>\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\univ\radiobut.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                               RelativePath="..\..\src\univ\spinbutt.cpp">\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\scrarrow.cpp">\r
+                                       Name="Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_spinbutt.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_spinbutt.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                         Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
                                         Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="DLL Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_spinbutt.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_spinbutt.obj"/>\r
+                               </FileConfiguration>\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\univ\scrolbar.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                               RelativePath="..\..\src\univ\statbmp.cpp">\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\scrthumb.cpp">\r
+                                       Name="Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_statbmp.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_statbmp.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                         Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
                                         Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="DLL Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_statbmp.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_statbmp.obj"/>\r
+                               </FileConfiguration>\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\univ\settingsuniv.cpp">\r
+                               RelativePath="..\..\src\univ\statbox.cpp">\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_statbox.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_statbox.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                         ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_statbox.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_statbox.obj"/>\r
+                               </FileConfiguration>\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\univ\slider.cpp">\r
+                               RelativePath="..\..\src\univ\statline.cpp">\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_statline.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_statline.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                         ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_statline.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_statline.obj"/>\r
+                               </FileConfiguration>\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\univ\spinbutt.cpp">\r
+                               RelativePath="..\..\src\univ\stattext.cpp">\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_stattext.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_stattext.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                         ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_stattext.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_stattext.obj"/>\r
+                               </FileConfiguration>\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\univ\statbmp.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                               RelativePath="..\..\src\univ\statusbr.cpp">\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\statbox.cpp">\r
+                                       Name="Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_statusbr.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_statusbr.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                         Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
                                         Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="DLL Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_statusbr.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_statusbr.obj"/>\r
+                               </FileConfiguration>\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\univ\statline.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                               RelativePath="..\..\src\univ\stdrend.cpp">\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                         ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\stattext.cpp">\r
                                 <FileConfiguration\r
                                         Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\univ\textctrl.cpp">\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\statusbr.cpp">\r
+                                       Name="Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_textctrl.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_textctrl.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                         Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
                                         Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="DLL Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_textctrl.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_textctrl.obj"/>\r
+                               </FileConfiguration>\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\univ\stdrend.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                               RelativePath="..\..\src\univ\tglbtn.cpp">\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\textctrl.cpp">\r
+                                       Name="Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_tglbtn.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_tglbtn.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                         Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
                                         Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="DLL Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_tglbtn.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_tglbtn.obj"/>\r
+                               </FileConfiguration>\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\univ\tglbtn.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                               RelativePath="..\..\src\univ\theme.cpp">\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                         ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\theme.cpp">\r
                                 <FileConfiguration\r
                                         Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\univ\toolbar.cpp">\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\toolbar.cpp">\r
+                                       Name="Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_toolbar.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_toolbar.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                         Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
                                         Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                                       Name="DLL Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_toolbar.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_toolbar.obj"/>\r
+                               </FileConfiguration>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\topluniv.cpp">\r
                                 <FileConfiguration\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\topluniv.cpp">\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\themes\win32.cpp">\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\themes\win32.cpp">\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\winuniv.cpp">\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\univ\winuniv.cpp">\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                 </Filter>\r
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                 </Filter>\r
@@ -2710,96 +4156,88 @@
                         <File\r
                                 RelativePath="..\..\include\wx\msw\setup.h">\r
                                 <FileConfiguration\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\setup.h">\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32">\r
+                                       Name="Debug|Win32">\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\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
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32">\r
+                                       Name="Release|Win32">\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\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
                                 </FileConfiguration>\r
                                 </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"/>\r
                                 <FileConfiguration\r
                                         Name="Universal Debug|Win32"/>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
                                         Name="Universal Debug|Win32"/>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32">\r
+                                       Name="Universal Release|Win32"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32">\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\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
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32">\r
+                                       Name="DLL Release|Win32">\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\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
                                 </FileConfiguration>\r
                                 </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\univ\setup.h">\r
                                 <FileConfiguration\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\univ\setup.h">\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32">\r
+                                       Name="Debug|Win32"/>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"/>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32">\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\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
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32">\r
+                                       Name="Universal Release|Win32">\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\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
                                 </FileConfiguration>\r
                                 </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"/>\r
                                 <FileConfiguration\r
                                         Name="DLL Debug|Win32"/>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
                                         Name="DLL Debug|Win32"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32">\r
+                                       Name="DLL Release|Win32"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32">\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\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
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32">\r
+                                       Name="DLL Universal Release|Win32">\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\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
                                 </FileConfiguration>\r
                                 </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"/>\r
                         </File>\r
                 </Filter>\r
                 <Filter\r
                         </File>\r
                 </Filter>\r
                 <Filter\r
@@ -2814,6 +4252,9 @@
                         <File\r
                                 RelativePath="..\..\include\wx\msw\ole\activex.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\ole\activex.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\anybutton.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\app.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\app.h">\r
                         </File>\r
@@ -2865,6 +4306,9 @@
                         <File\r
                                 RelativePath="..\..\include\wx\msw\combobox.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\combobox.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\commandlinkbutton.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\control.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\control.h">\r
                         </File>\r
@@ -2874,6 +4318,9 @@
                         <File\r
                                 RelativePath="..\..\include\wx\msw\cursor.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\cursor.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\custombgwin.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\ole\dataform.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\ole\dataform.h">\r
                         </File>\r
@@ -2884,10 +4331,10 @@
                                 RelativePath="..\..\include\wx\msw\ole\dataobj2.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\ole\dataobj2.h">\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\msw\datecontrols.h">\r
+                               RelativePath="..\..\include\wx\msw\datectrl.h">\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\msw\datectrl.h">\r
+                               RelativePath="..\..\include\wx\msw\datetimectrl.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\dc.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\dc.h">\r
@@ -2952,40 +4399,31 @@
                         <File\r
                                 RelativePath="..\..\include\wx\msw\genrcdefs.h">\r
                                 <FileConfiguration\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\genrcdefs.h">\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32">\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
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32">\r
+                                       Name="Debug|Win32">\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\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\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
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32">\r
+                                       Name="Release|Win32">\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\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\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
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32">\r
+                                       Name="Universal Debug|Win32">\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\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\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
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32">\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32">\r
@@ -2997,39 +4435,45 @@
                                                 AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivu\wx\msw&quot;"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                                 AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivu\wx\msw&quot;"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32">\r
+                                       Name="DLL Debug|Win32">\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\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\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
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32">\r
+                                       Name="DLL Release|Win32">\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\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\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
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32">\r
+                                       Name="DLL Universal Debug|Win32">\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\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\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
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32">\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
                                 </FileConfiguration>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\glcanvas.h">\r
                         </File>\r
                                 </FileConfiguration>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\glcanvas.h">\r
                         </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\msw\headercol.h">\r
-                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\headerctrl.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\headerctrl.h">\r
                         </File>\r
@@ -3045,6 +4489,9 @@
                         <File\r
                                 RelativePath="..\..\include\wx\msw\htmlhelp.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\htmlhelp.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\hyperlink.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\icon.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\icon.h">\r
                         </File>\r
@@ -3087,6 +4534,9 @@
                         <File\r
                                 RelativePath="..\..\include\wx\msw\msvcrt.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\msvcrt.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\nonownedwnd.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\notebook.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\notebook.h">\r
                         </File>\r
@@ -3096,9 +4546,15 @@
                         <File\r
                                 RelativePath="..\..\include\wx\msw\ole\oleutils.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\ole\oleutils.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\ownerdrw.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\palette.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\palette.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\panel.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\pen.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\pen.h">\r
                         </File>\r
@@ -3111,6 +4567,9 @@
                         <File\r
                                 RelativePath="..\..\include\wx\msw\printwin.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\printwin.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\progdlg.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\radiobox.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\radiobox.h">\r
                         </File>\r
@@ -3124,10 +4583,10 @@
                                 RelativePath="..\..\include\wx\msw\region.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\region.h">\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\msw\scrolbar.h">\r
+                               RelativePath="..\..\include\wx\msw\richmsgdlg.h">\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\msw\setup0.h">\r
+                               RelativePath="..\..\include\wx\msw\scrolbar.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\slider.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\slider.h">\r
@@ -3156,9 +4615,6 @@
                         <File\r
                                 RelativePath="..\..\include\wx\msw\statusbar.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\statusbar.h">\r
                         </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\msw\tabctrl.h">\r
-                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\taskbar.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\taskbar.h">\r
                         </File>\r
@@ -3171,6 +4627,9 @@
                         <File\r
                                 RelativePath="..\..\include\wx\msw\tglbtn.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\tglbtn.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\timectrl.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\toolbar.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\toolbar.h">\r
                         </File>\r
@@ -3192,6 +4651,12 @@
                         <File\r
                                 RelativePath="..\..\include\wx\msw\uxthemep.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\uxthemep.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\webview_ie.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\webviewhistoryitem_ie.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\window.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\window.h">\r
                         </File>\r
@@ -3238,6 +4703,9 @@
                         <File\r
                                 RelativePath="..\..\include\wx\generic\ctrlsub.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\ctrlsub.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\custombgwin.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\dataview.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\dataview.h">\r
                         </File>\r
@@ -3256,6 +4724,12 @@
                         <File\r
                                 RelativePath="..\..\include\wx\generic\dragimgg.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\dragimgg.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\dvrenderer.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\dvrenderers.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\fdrepdlg.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\fdrepdlg.h">\r
                         </File>\r
@@ -3281,13 +4755,13 @@
                                 RelativePath="..\..\include\wx\generic\gridctrl.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\gridctrl.h">\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\generic\gridsel.h">\r
+                               RelativePath="..\..\include\wx\generic\grideditors.h">\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\generic\headercol.h">\r
+                               RelativePath="..\..\include\wx\generic\gridsel.h">\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\generic\headerctrl.h">\r
+                               RelativePath="..\..\include\wx\generic\headerctrlg.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\helpext.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\helpext.h">\r
@@ -3295,6 +4769,9 @@
                         <File\r
                                 RelativePath="..\..\include\wx\generic\hyperlink.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\hyperlink.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\infobar.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\laywin.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\laywin.h">\r
                         </File>\r
@@ -3334,6 +4811,9 @@
                         <File\r
                                 RelativePath="..\..\include\wx\generic\propdlg.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\propdlg.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\richmsgdlgg.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\sashwin.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\sashwin.h">\r
                         </File>\r
@@ -3362,10 +4842,10 @@
                                 RelativePath="..\..\include\wx\generic\statusbr.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\statusbr.h">\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\generic\tabg.h">\r
+                               RelativePath="..\..\include\wx\generic\textdlgg.h">\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\generic\textdlgg.h">\r
+                               RelativePath="..\..\include\wx\generic\timectrl.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\treectlg.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\treectlg.h">\r
@@ -3377,6 +4857,9 @@
                 <Filter\r
                         Name="wxUniv Headers"\r
                         UniqueIdentifier="{46168D7C-2783-50F3-AE9D-A740D5FF0B44}">\r
                 <Filter\r
                         Name="wxUniv Headers"\r
                         UniqueIdentifier="{46168D7C-2783-50F3-AE9D-A740D5FF0B44}">\r
+                       <File\r
+                               RelativePath="..\..\include\wx\univ\anybutton.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\univ\app.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\univ\app.h">\r
                         </File>\r
@@ -3407,6 +4890,9 @@
                         <File\r
                                 RelativePath="..\..\include\wx\univ\control.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\univ\control.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\univ\custombgwin.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\univ\dialog.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\univ\dialog.h">\r
                         </File>\r
@@ -3434,6 +4920,9 @@
                         <File\r
                                 RelativePath="..\..\include\wx\univ\notebook.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\univ\notebook.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\univ\panel.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\univ\radiobox.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\univ\radiobox.h">\r
                         </File>\r
@@ -3543,6 +5032,9 @@
                         <File\r
                                 RelativePath="..\..\include\wx\html\m_templ.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\html\m_templ.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\html\styleparams.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\html\winpars.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\html\winpars.h">\r
                         </File>\r
@@ -3562,6 +5054,12 @@
                         <File\r
                                 RelativePath="..\..\include\wx\propgrid\advprops.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\propgrid\advprops.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\affinematrix2d.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\affinematrix2dbase.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\anidecod.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\anidecod.h">\r
                         </File>\r
@@ -3571,6 +5069,15 @@
                         <File\r
                                 RelativePath="..\..\include\wx\animdecod.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\animdecod.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\anybutton.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\ribbon\art.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\ribbon\art_internal.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\artprov.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\artprov.h">\r
                         </File>\r
@@ -3583,6 +5090,12 @@
                         <File\r
                                 RelativePath="..\..\include\wx\aui\auibook.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\aui\auibook.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\bannerwindow.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\ribbon\bar.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\bitmap.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\bitmap.h">\r
                         </File>\r
@@ -3595,6 +5108,9 @@
                         <File\r
                                 RelativePath="..\..\include\wx\bookctrl.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\bookctrl.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\persist\bookctrl.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\brush.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\brush.h">\r
                         </File>\r
@@ -3604,6 +5120,9 @@
                         <File\r
                                 RelativePath="..\..\include\wx\button.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\button.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\ribbon\buttonbar.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\cairo.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\cairo.h">\r
                         </File>\r
@@ -3649,15 +5168,27 @@
                         <File\r
                                 RelativePath="..\..\include\wx\colour.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\colour.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\colourdata.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\combo.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\combobox.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\combo.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\combobox.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\commandlinkbutton.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\compositewin.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\control.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\control.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\ribbon\control.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\cshelp.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\cshelp.h">\r
                         </File>\r
@@ -3667,6 +5198,9 @@
                         <File\r
                                 RelativePath="..\..\include\wx\cursor.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\cursor.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\custombgwin.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\dataobj.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\dataobj.h">\r
                         </File>\r
@@ -3679,6 +5213,9 @@
                         <File\r
                                 RelativePath="..\..\include\wx\dateevt.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\dateevt.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\datetimectrl.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\dc.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\dc.h">\r
                         </File>\r
@@ -3745,6 +5282,9 @@
                         <File\r
                                 RelativePath="..\..\include\wx\dragimag.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\dragimag.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\dvrenderers.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\editlbox.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\editlbox.h">\r
                         </File>\r
@@ -3758,7 +5298,7 @@
                                 RelativePath="..\..\include\wx\encinfo.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\encinfo.h">\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\evtloop.h">\r
+                               RelativePath="..\..\include\wx\evtloopsrc.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\fdrepdlg.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\fdrepdlg.h">\r
@@ -3769,6 +5309,9 @@
                         <File\r
                                 RelativePath="..\..\include\wx\filedlg.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\filedlg.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\filehistory.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\filepicker.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\filepicker.h">\r
                         </File>\r
@@ -3781,6 +5324,9 @@
                         <File\r
                                 RelativePath="..\..\include\wx\font.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\font.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\fontdata.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\fontdlg.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\fontdlg.h">\r
                         </File>\r
@@ -3799,6 +5345,9 @@
                         <File\r
                                 RelativePath="..\..\include\wx\aui\framemanager.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\aui\framemanager.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\ribbon\gallery.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\gauge.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\gauge.h">\r
                         </File>\r
@@ -3892,6 +5441,12 @@
                         <File\r
                                 RelativePath="..\..\include\wx\imagxpm.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\imagxpm.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\infobar.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\itemid.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\joystick.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\joystick.h">\r
                         </File>\r
@@ -3937,6 +5492,9 @@
                         <File\r
                                 RelativePath="..\..\include\wx\minifram.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\minifram.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\mousemanager.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msgdlg.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msgdlg.h">\r
                         </File>\r
@@ -3964,18 +5522,27 @@
                         <File\r
                                 RelativePath="..\..\include\wx\ownerdrw.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\ownerdrw.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\ribbon\page.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\palette.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\panel.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\palette.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\panel.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\ribbon\panel.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\paper.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\pen.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\paper.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\pen.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\persist.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\pickerbase.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\pickerbase.h">\r
                         </File>\r
@@ -4027,42 +5594,90 @@
                         <File\r
                                 RelativePath="..\..\include\wx\radiobut.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\radiobut.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\range.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\rawbmp.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\rawbmp.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\rearrangectrl.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\region.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\renderer.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\region.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\renderer.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richmsgdlg.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextbackgroundpage.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextborderspage.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextbuffer.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextbuffer.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextbulletspage.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextctrl.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextctrl.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextdialogpage.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextfontpage.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextformatdlg.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtexthtml.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextformatdlg.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtexthtml.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextimagedlg.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextindentspage.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextliststylepage.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextmarginspage.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextprint.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextprint.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextsizepage.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextstyledlg.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextstyledlg.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextstylepage.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextstyles.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextsymboldlg.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextstyles.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextsymboldlg.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextuicustomization.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextxml.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextxml.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtooltip.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\sashwin.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\sashwin.h">\r
                         </File>\r
@@ -4099,6 +5714,9 @@
                         <File\r
                                 RelativePath="..\..\include\wx\splash.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\splash.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\persist\splitter.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\splitter.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\splitter.h">\r
                         </File>\r
@@ -4124,10 +5742,7 @@
                                 RelativePath="..\..\include\wx\stc\stc.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\stc\stc.h">\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\tab.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\tabctrl.h">\r
+                               RelativePath="..\..\include\wx\aui\tabart.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\aui\tabmdi.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\aui\tabmdi.h">\r
@@ -4138,6 +5753,9 @@
                         <File\r
                                 RelativePath="..\..\include\wx\tbarbase.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\tbarbase.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\textcompleter.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\textctrl.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\textctrl.h">\r
                         </File>\r
@@ -4147,15 +5765,24 @@
                         <File\r
                                 RelativePath="..\..\include\wx\textentry.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\textentry.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\textwrapper.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\tglbtn.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\tglbtn.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\timectrl.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\tipdlg.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\tipwin.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\tipdlg.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\tipwin.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\ribbon\toolbar.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\toolbar.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\toolbar.h">\r
                         </File>\r
@@ -4165,24 +5792,39 @@
                         <File\r
                                 RelativePath="..\..\include\wx\tooltip.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\tooltip.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\persist\toplevel.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\toplevel.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\treebase.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\toplevel.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\treebase.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\persist\treebook.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\treebook.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\treectrl.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\treebook.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\treectrl.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\treelist.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\uiaction.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\valgen.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\validate.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\valgen.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\validate.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\valnum.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\valtext.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\valtext.h">\r
                         </File>\r
@@ -4198,12 +5840,24 @@
                         <File\r
                                 RelativePath="..\..\include\wx\vscroll.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\vscroll.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\webview.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\webviewarchivehandler.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\persist\window.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\window.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\windowid.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\window.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\windowid.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\withimages.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\wizard.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\wizard.h">\r
                         </File>\r
@@ -4222,6 +5876,9 @@
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_animatctrl.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_animatctrl.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_bannerwindow.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_bmp.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_bmp.h">\r
                         </File>\r
@@ -4252,12 +5909,18 @@
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_clrpicker.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_clrpicker.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_cmdlinkbn.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_collpane.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_combo.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_collpane.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_combo.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_comboctrl.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_datectrl.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_datectrl.h">\r
                         </File>\r
@@ -4267,6 +5930,12 @@
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_dlg.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_dlg.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_editlbox.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_filectrl.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_filepicker.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_filepicker.h">\r
                         </File>\r
@@ -4369,9 +6038,15 @@
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_tglbtn.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_tglbtn.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_timectrl.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_toolb.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_toolb.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_toolbk.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_tree.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_tree.h">\r
                         </File>\r