avoid permanently frozen TLW when frozen child is destroyed with GTK+ 2.18

[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 7f04f486acc8105d61610bf33f41c598c8e8a56b..1240485c2bae3f483c1a24b8519fba5ce58464d4 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.8 (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\wxmsw291ud_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\wxmsw291ud_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\wxmsw291ud_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=wxmsw291ud_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\wxmsw291u_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\wxmsw291u_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\wxmsw291u_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=wxmsw291u_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\wxmswuniv291ud_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\wxmswuniv291ud_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\wxmswuniv291ud_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=wxmswuniv291ud_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\wxmswuniv291u_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\wxmswuniv291u_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\wxmswuniv291u_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=wxmswuniv291u_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


@@ -618,49 +630,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


@@ -789,6 +801,9 @@
                        <File\r
                                RelativePath="..\..\src\common\menucmn.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 +813,15 @@
                        <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\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


@@ -831,9 +852,6 @@
                        <File\r
                                RelativePath="..\..\src\common\sizer.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\common\sizer.cpp">\r
                        </File>\r

-                       <File\r
-                               RelativePath="..\..\src\common\spinbuttcmn.cpp">\r
-                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\spinctrlcmn.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\common\spinctrlcmn.cpp">\r
                        </File>\r


@@ -864,6 +882,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


@@ -895,49 +916,76 @@
                        <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
                                        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\ole\activex.cpp">\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\msw\app.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\artmsw.cpp">\r
                                <FileConfiguration\r
                        <File\r
                                RelativePath="..\..\src\msw\app.cpp">\r
                        </File>\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


@@ -949,16 +997,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


@@ -967,16 +1039,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


@@ -985,46 +1081,118 @@
                        <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
+                                       Name="DLL Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_checkbox.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\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
+                                       Name="DLL Universal Release|Win32"\r

                                        ExcludedFromBuild="TRUE"/>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\checklst.cpp">\r
                                <FileConfiguration\r
                                        ExcludedFromBuild="TRUE"/>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\checklst.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_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
+                                       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
                                        ExcludedFromBuild="TRUE"/>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\choice.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_choice.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_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
                                        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_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
                                        ExcludedFromBuild="TRUE"/>\r
                        </File>\r
                        <File\r


@@ -1033,16 +1201,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


@@ -1051,46 +1219,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


@@ -1120,16 +1336,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


@@ -1141,16 +1381,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


@@ -1159,16 +1399,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


@@ -1186,31 +1426,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


@@ -1219,16 +1483,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


@@ -1240,31 +1504,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


@@ -1282,16 +1570,16 @@
                        <File\r
                                RelativePath="..\..\src\msw\headerctrl.cpp">\r
                                <FileConfiguration\r
                        <File\r
                                RelativePath="..\..\src\msw\headerctrl.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


@@ -1309,46 +1597,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


@@ -1357,61 +1693,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


@@ -1420,16 +1780,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


@@ -1438,46 +1798,70 @@
                        <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
                        <File\r
                                RelativePath="..\..\src\msw\notebook.cpp">\r
                                <FileConfiguration\r
                                        ExcludedFromBuild="TRUE"/>\r
                        </File>\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


@@ -1486,16 +1870,16 @@
                        <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
                                        ExcludedFromBuild="TRUE"/>\r
                        </File>\r
                        <File\r


@@ -1516,31 +1900,79 @@
                        <File\r
                                RelativePath="..\..\src\msw\radiobox.cpp">\r
                                <FileConfiguration\r
                        <File\r
                                RelativePath="..\..\src\msw\radiobox.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_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
+                                       Name="DLL Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_radiobox.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\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
+                                       Name="DLL Universal Release|Win32"\r

                                        ExcludedFromBuild="TRUE"/>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\radiobut.cpp">\r
                                <FileConfiguration\r
                                        ExcludedFromBuild="TRUE"/>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\radiobut.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_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
+                                       Name="DLL Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_radiobut.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\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
+                                       Name="DLL Universal Release|Win32"\r

                                        ExcludedFromBuild="TRUE"/>\r
                        </File>\r
                        <File\r
                                        ExcludedFromBuild="TRUE"/>\r
                        </File>\r
                        <File\r


@@ -1552,16 +1984,40 @@
                        <File\r
                                RelativePath="..\..\src\msw\scrolbar.cpp">\r
                                <FileConfiguration\r
                        <File\r
                                RelativePath="..\..\src\msw\scrolbar.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_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
+                                       Name="DLL Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_scrolbar.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\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
+                                       Name="DLL Universal Release|Win32"\r

                                        ExcludedFromBuild="TRUE"/>\r
                        </File>\r
                        <File\r
                                        ExcludedFromBuild="TRUE"/>\r
                        </File>\r
                        <File\r


@@ -1570,181 +2026,397 @@
                        <File\r
                                RelativePath="..\..\src\msw\slider.cpp">\r
                                <FileConfiguration\r
                        <File\r
                                RelativePath="..\..\src\msw\slider.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_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
+                                       Name="DLL Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_slider.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\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
+                                       Name="DLL Universal Release|Win32"\r

                                        ExcludedFromBuild="TRUE"/>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\spinbutt.cpp">\r
                                <FileConfiguration\r
                                        ExcludedFromBuild="TRUE"/>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\spinbutt.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_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
+                                       Name="DLL Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_spinbutt.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\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
+                                       Name="DLL Universal Release|Win32"\r

                                        ExcludedFromBuild="TRUE"/>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\spinctrl.cpp">\r
                                <FileConfiguration\r
                                        ExcludedFromBuild="TRUE"/>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\spinctrl.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\statbmp.cpp">\r
                                <FileConfiguration\r
                                        ExcludedFromBuild="TRUE"/>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\statbmp.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_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
+                                       Name="DLL Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_statbmp.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\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
+                                       Name="DLL Universal Release|Win32"\r

                                        ExcludedFromBuild="TRUE"/>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\statbox.cpp">\r
                                <FileConfiguration\r
                                        ExcludedFromBuild="TRUE"/>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\statbox.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_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
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r

                                        ExcludedFromBuild="TRUE"/>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\statline.cpp">\r
                                <FileConfiguration\r
                                        ExcludedFromBuild="TRUE"/>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\statline.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_statline.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_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
                                RelativePath="..\..\src\msw\stattext.cpp">\r
                                <FileConfiguration\r
                                        ExcludedFromBuild="TRUE"/>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\stattext.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_stattext.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_stattext.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_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
                                RelativePath="..\..\src\msw\statusbar.cpp">\r
                                <FileConfiguration\r
                                        ExcludedFromBuild="TRUE"/>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\statusbar.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\textctrl.cpp">\r
                                <FileConfiguration\r
                                        ExcludedFromBuild="TRUE"/>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\textctrl.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_textctrl.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_textctrl.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_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
+                                       Name="DLL Universal Release|Win32"\r

                                        ExcludedFromBuild="TRUE"/>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\textentry.cpp">\r
                                <FileConfiguration\r
                                        ExcludedFromBuild="TRUE"/>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\textentry.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\tglbtn.cpp">\r
                                <FileConfiguration\r
                                        ExcludedFromBuild="TRUE"/>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\tglbtn.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_tglbtn.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_tglbtn.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_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
+                                       Name="DLL Universal Release|Win32"\r

                                        ExcludedFromBuild="TRUE"/>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\toolbar.cpp">\r
                                <FileConfiguration\r
                                        ExcludedFromBuild="TRUE"/>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\toolbar.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_toolbar.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_toolbar.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_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
+                                       Name="DLL Universal Release|Win32"\r

                                        ExcludedFromBuild="TRUE"/>\r
                        </File>\r
                        <File\r
                                        ExcludedFromBuild="TRUE"/>\r
                        </File>\r
                        <File\r


@@ -1756,17 +2428,32 @@
                        <File\r
                                RelativePath="..\..\src\msw\treectrl.cpp">\r
                                <FileConfiguration\r
                        <File\r
                                RelativePath="..\..\src\msw\treectrl.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\uiaction.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\utilsgui.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\utilsgui.cpp">\r


@@ -1780,16 +2467,16 @@
                        <File\r
                                RelativePath="..\..\src\msw\version.rc">\r
                                <FileConfiguration\r
                        <File\r
                                RelativePath="..\..\src\msw\version.rc">\r
                                <FileConfiguration\r

-                                       Name="Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r

                                        ExcludedFromBuild="TRUE"/>\r
                                <FileConfiguration\r
                                        ExcludedFromBuild="TRUE"/>\r
                                <FileConfiguration\r

-                                       Name="Universal 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


@@ -1805,19 +2492,43 @@
                        <File\r
                                RelativePath="..\..\src\generic\accel.cpp">\r
                                <FileConfiguration\r
                        <File\r
                                RelativePath="..\..\src\generic\accel.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="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
                                        ExcludedFromBuild="TRUE"/>\r
                                <FileConfiguration\r

-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r

                                        ExcludedFromBuild="TRUE"/>\r
                                        ExcludedFromBuild="TRUE"/>\r

-                       </File>\r
-                       <File\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

                                RelativePath="..\..\src\generic\busyinfo.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\generic\busyinfo.cpp">\r
                        </File>\r
                        <File\r


@@ -1838,16 +2549,16 @@
                        <File\r
                                RelativePath="..\..\src\generic\colrdlgg.cpp">\r
                                <FileConfiguration\r
                        <File\r
                                RelativePath="..\..\src\generic\colrdlgg.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
                                        ExcludedFromBuild="TRUE"/>\r
                        </File>\r
                        <File\r


@@ -1862,16 +2573,16 @@
                        <File\r
                                RelativePath="..\..\src\generic\dirdlgg.cpp">\r
                                <FileConfiguration\r
                        <File\r
                                RelativePath="..\..\src\generic\dirdlgg.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
                                        ExcludedFromBuild="TRUE"/>\r
                        </File>\r
                        <File\r


@@ -1880,17 +2591,41 @@
                        <File\r
                                RelativePath="..\..\src\generic\fdrepdlg.cpp">\r
                                <FileConfiguration\r
                        <File\r
                                RelativePath="..\..\src\generic\fdrepdlg.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="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
                                        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\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\filectrlg.cpp">\r


@@ -1898,16 +2633,16 @@
                        <File\r
                                RelativePath="..\..\src\generic\filedlgg.cpp">\r
                                <FileConfiguration\r
                        <File\r
                                RelativePath="..\..\src\generic\filedlgg.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
                                        ExcludedFromBuild="TRUE"/>\r
                        </File>\r
                        <File\r


@@ -1916,21 +2651,24 @@
                        <File\r
                                RelativePath="..\..\src\generic\fontdlgg.cpp">\r
                                <FileConfiguration\r
                        <File\r
                                RelativePath="..\..\src\generic\fontdlgg.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\generic\fontpickerg.cpp">\r
                        </File>\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\headerctrlg.cpp">\r
                        </File>\r


@@ -1940,17 +2678,41 @@
                        <File\r
                                RelativePath="..\..\src\generic\listctrl.cpp">\r
                                <FileConfiguration\r
                        <File\r
                                RelativePath="..\..\src\generic\listctrl.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="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
                                        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\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\logg.cpp">\r


@@ -1958,31 +2720,31 @@
                        <File\r
                                RelativePath="..\..\src\generic\mdig.cpp">\r
                                <FileConfiguration\r
                        <File\r
                                RelativePath="..\..\src\generic\mdig.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\generic\msgdlgg.cpp">\r
                                <FileConfiguration\r
                                        ExcludedFromBuild="TRUE"/>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\generic\msgdlgg.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
                                        ExcludedFromBuild="TRUE"/>\r
                        </File>\r
                        <File\r


@@ -2027,16 +2789,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
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\generic_statusbr.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\generic_statusbr.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\generic_statusbr.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\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
+                                       Name="DLL Universal Release|Win32"\r

                                        ExcludedFromBuild="TRUE"/>\r
                        </File>\r
                        <File\r
                                        ExcludedFromBuild="TRUE"/>\r
                        </File>\r
                        <File\r


@@ -2067,601 +2853,1201 @@
                        <File\r
                                RelativePath="..\..\src\univ\bmpbuttn.cpp">\r
                                <FileConfiguration\r
                        <File\r
                                RelativePath="..\..\src\univ\bmpbuttn.cpp">\r
                                <FileConfiguration\r

-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\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\button.cpp">\r
+                                       Name="Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_bmpbuttn.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_bmpbuttn.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_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
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\univ\checkbox.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                               RelativePath="..\..\src\univ\button.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\checklst.cpp">\r
+                                       Name="Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_button.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_button.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_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
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\univ\choice.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                               RelativePath="..\..\src\univ\checkbox.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\combobox.cpp">\r
+                                       Name="Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_checkbox.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_checkbox.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_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
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\univ\control.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                               RelativePath="..\..\src\univ\checklst.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\ctrlrend.cpp">\r
+                                       Name="Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_checklst.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_checklst.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_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
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\univ\dialog.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                               RelativePath="..\..\src\univ\choice.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\framuniv.cpp">\r
+                                       Name="Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_choice.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_choice.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_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
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\univ\gauge.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                               RelativePath="..\..\src\univ\combobox.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\themes\gtk.cpp">\r
+                                       Name="Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_combobox.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_combobox.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_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
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\univ\inpcons.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                               RelativePath="..\..\src\univ\control.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\inphand.cpp">\r
+                                       Name="Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_control.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_control.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_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
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\univ\listbox.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                               RelativePath="..\..\src\univ\ctrlrend.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\menu.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\dialog.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\themes\metal.cpp">\r
+                                       Name="Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_dialog.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_dialog.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_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
                        <File\r

-                               RelativePath="..\..\src\univ\themes\mono.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\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\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\radiobox.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\radiobut.cpp">\r
+                               RelativePath="..\..\src\univ\themes\gtk.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="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
                                        ExcludedFromBuild="TRUE"/>\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\univ\scrarrow.cpp">\r
+                               RelativePath="..\..\src\univ\inpcons.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="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
                                        ExcludedFromBuild="TRUE"/>\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\univ\scrolbar.cpp">\r
+                               RelativePath="..\..\src\univ\inphand.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="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
                                        ExcludedFromBuild="TRUE"/>\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\univ\scrthumb.cpp">\r
+                               RelativePath="..\..\src\univ\listbox.cpp">\r

                                <FileConfiguration\r
                                <FileConfiguration\r

-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\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\settingsuniv.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\slider.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\spinbutt.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\statbmp.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\statbox.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\statline.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\stattext.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\statusbr.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
+                                       Name="Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_scrolbar.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\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
                                        ExcludedFromBuild="TRUE"/>\r

-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\stdrend.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_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
+                               RelativePath="..\..\src\univ\scrthumb.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\textctrl.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\tglbtn.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
+                                       Name="Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_slider.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\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
                                        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
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="TRUE"/>\r
                                <FileConfiguration\r

-                                       Name="DLL 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
                                <FileConfiguration\r

-                                       Name="Release|Win32"\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
+                               RelativePath="..\..\src\univ\spinbutt.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_spinbutt.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\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
+                                       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_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
+                               RelativePath="..\..\src\univ\statbmp.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_statbmp.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\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
+                                       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_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
+                               RelativePath="..\..\src\univ\statbox.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_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
+                                       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_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
+                               RelativePath="..\..\src\univ\statline.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_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
+                                       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_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
+                               RelativePath="..\..\src\univ\stattext.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_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
+                                       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_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
+                               RelativePath="..\..\src\univ\statusbr.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_statusbr.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\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
+                                       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_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
+                               RelativePath="..\..\src\univ\stdrend.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\textctrl.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_textctrl.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\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
+                                       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_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
+                               RelativePath="..\..\src\univ\tglbtn.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_tglbtn.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\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
+                                       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_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
+                               RelativePath="..\..\src\univ\theme.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
                                        ExcludedFromBuild="TRUE"/>\r
                                <FileConfiguration\r

-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r

                                        ExcludedFromBuild="TRUE"/>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\toolbar.cpp">\r
                                <FileConfiguration\r
                                        ExcludedFromBuild="TRUE"/>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\toolbar.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="Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_toolbar.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\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
                                        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_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


@@ -2671,96 +4057,96 @@
                        <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
+                                               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
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                                AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\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
+                                               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
                                </FileConfiguration>\r
                                                AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\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
+                                               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
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                                AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\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
+                                               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
                                </FileConfiguration>\r
                                                AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\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
+                                               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
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                                AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\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
+                                               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
                                </FileConfiguration>\r
                                                AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\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
+                                               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
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                                AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\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
+                                               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
                                </FileConfiguration>\r
                                                AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\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


@@ -2844,9 +4230,6 @@
                        <File\r
                                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
-                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\msw\datectrl.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\datectrl.h">\r
                        </File>\r


@@ -2913,40 +4296,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


@@ -2958,31 +4332,40 @@
                                                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
                                </FileConfiguration>\r
                        </File>\r
                        <File\r


@@ -3054,6 +4437,9 @@
                        <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


@@ -3211,6 +4597,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


@@ -3250,6 +4642,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


@@ -3544,6 +4939,9 @@
                        <File\r
                                RelativePath="..\..\include\wx\bmpcbox.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\bmpcbox.h">\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\persist\bookctrl.h">\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\bookctrl.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\bookctrl.h">\r
                        </File>\r


@@ -3697,6 +5095,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


@@ -3710,7 +5111,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


@@ -3844,6 +5245,9 @@
                        <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\joystick.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\joystick.h">\r
                        </File>\r


@@ -3889,6 +5293,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


@@ -3928,6 +5335,9 @@
                        <File\r
                                RelativePath="..\..\include\wx\pen.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


@@ -4096,6 +5506,9 @@
                        <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


@@ -4117,15 +5530,24 @@
                        <File\r
                                RelativePath="..\..\include\wx\toplevel.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\toplevel.h">\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\persist\toplevel.h">\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\treebase.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\treebook.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\treebase.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\treebook.h">\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\persist\treebook.h">\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\treectrl.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\treectrl.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\valgen.h">\r
                        </File>\r


@@ -4150,6 +5572,9 @@
                        <File\r
                                RelativePath="..\..\include\wx\window.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\window.h">\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\persist\window.h">\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\windowid.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\windowid.h">\r
                        </File>\r


@@ -4207,6 +5632,9 @@
                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_combo.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


@@ -4216,6 +5644,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