Fix wxHash{Set,Map} compilation with g++ 4.7 in C++11 mode.

[wxWidgets.git] / build / msw / wx_vc9_core.vcproj

diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj
index 19f9418152e8c289ea13ba8427a8c424e9fcda52..efca076487b75815bcb23c9b5bed76f29b27fe05 100644 (file)
--- a/build/msw/wx_vc9_core.vcproj
+++ b/build/msw/wx_vc9_core.vcproj
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="Windows-1252"?>\r
 <!--\r
 \r
 <?xml version="1.0" encoding="Windows-1252"?>\r
 <!--\r
 \r

-  This makefile was generated by\r
-  Bakefile 0.2.5 (http://www.bakefile.org)\r
+  This project was generated by\r
+  Bakefile 0.2.9 (http://www.bakefile.org)\r

   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r


@@ -22,10 +22,94 @@
        </ToolFiles>\r
        <Configurations>\r
                <Configuration\r
        </ToolFiles>\r
        <Configurations>\r
                <Configuration\r

-                       Name="DLL Universal Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswunivudll\core"\r
-                       ConfigurationType="2"\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswud\core"\r
+                       ConfigurationType="4"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       CharacterSet="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalOptions="/MP"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
+                               ExceptionHandling="1"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
+                               RuntimeTypeInfo="true"\r
+                               UsePrecompiledHeader="2"\r
+                               PrecompiledHeaderThrough="wx/wxprec.h"\r
+                               PrecompiledHeaderFile="vc_mswud\wxprec_corelib.pch"\r
+                               ObjectFile="vc_mswud\core\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_core.pdb"\r
+                               WarningLevel="4"\r
+                               SuppressStartupBanner="true"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxmsw29ud_core.lib"\r
+                               SuppressStartupBanner="true"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                               OutputFile="..\..\lib\vc_lib\wx_vc9_core.bsc"\r
+                               SuppressStartupBanner="true"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswu\core"\r
+                       ConfigurationType="4"\r

                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r


@@ -43,23 +127,24 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r

-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r

                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r

-                               PrecompiledHeaderFile="vc_mswunivudll\wxprec_coredll.pch"\r
-                               AssemblerListingLocation="vc_mswunivudll\core\"\r
-                               ObjectFile="vc_mswunivudll\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb"\r
+                               PrecompiledHeaderFile="vc_mswu\wxprec_corelib.pch"\r
+                               ObjectFile="vc_mswu\core\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_core.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r


@@ -69,26 +154,17 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r

                                Culture="1033"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r

                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r

-                               Name="VCLinkerTool"\r
-                               AdditionalOptions=""\r
-                               AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.dll"\r
-                               LinkIncremental="2"\r
-                               ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_core.lib"\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxmsw29u_core.lib"\r

                                SuppressStartupBanner="true"\r
                                SuppressStartupBanner="true"\r

-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateManifest="true"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb"\r
-                               TargetMachine="1"\r

                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r


@@ -101,7 +177,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r

-                               OutputFile="..\..\lib\vc_dll\wx_vc9_core.bsc"\r
+                               OutputFile="..\..\lib\vc_lib\wx_vc9_core.bsc"\r

                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r


@@ -112,10 +188,10 @@
                        />\r
                </Configuration>\r
                <Configuration\r
                        />\r
                </Configuration>\r
                <Configuration\r

-                       Name="DLL Universal Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswunivuddll\core"\r
-                       ConfigurationType="2"\r
+                       Name="Universal Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswunivud\core"\r
+                       ConfigurationType="4"\r

                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r


@@ -133,14 +209,16 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r

-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r

                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r


@@ -148,10 +226,9 @@
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r

-                               PrecompiledHeaderFile="vc_mswunivuddll\wxprec_coredll.pch"\r
-                               AssemblerListingLocation="vc_mswunivuddll\core\"\r
-                               ObjectFile="vc_mswunivuddll\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivud\wxprec_corelib.pch"\r
+                               ObjectFile="vc_mswunivud\core\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_core.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r


@@ -161,26 +238,17 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r

                                Culture="1033"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r

                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r

-                               Name="VCLinkerTool"\r
-                               AdditionalOptions=""\r
-                               AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.dll"\r
-                               LinkIncremental="2"\r
-                               ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_core.lib"\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_core.lib"\r

                                SuppressStartupBanner="true"\r
                                SuppressStartupBanner="true"\r

-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateManifest="true"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb"\r
-                               TargetMachine="1"\r

                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r


@@ -193,7 +261,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r

-                               OutputFile="..\..\lib\vc_dll\wx_vc9_core.bsc"\r
+                               OutputFile="..\..\lib\vc_lib\wx_vc9_core.bsc"\r

                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r


@@ -204,10 +272,10 @@
                        />\r
                </Configuration>\r
                <Configuration\r
                        />\r
                </Configuration>\r
                <Configuration\r

-                       Name="DLL Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswudll\core"\r
-                       ConfigurationType="2"\r
+                       Name="Universal Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswunivu\core"\r
+                       ConfigurationType="4"\r

                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r


@@ -225,23 +293,24 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r

-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r

                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r

-                               PrecompiledHeaderFile="vc_mswudll\wxprec_coredll.pch"\r
-                               AssemblerListingLocation="vc_mswudll\core\"\r
-                               ObjectFile="vc_mswudll\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivu\wxprec_corelib.pch"\r
+                               ObjectFile="vc_mswunivu\core\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_core.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r


@@ -251,26 +320,17 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r

                                Culture="1033"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r

                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r

-                               Name="VCLinkerTool"\r
-                               AdditionalOptions=""\r
-                               AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw290u_core_vc_custom.dll"\r
-                               LinkIncremental="2"\r
-                               ImportLibrary="..\..\lib\vc_dll\wxmsw29u_core.lib"\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxmswuniv29u_core.lib"\r

                                SuppressStartupBanner="true"\r
                                SuppressStartupBanner="true"\r

-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateManifest="true"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb"\r
-                               TargetMachine="1"\r

                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r


@@ -283,7 +343,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r

-                               OutputFile="..\..\lib\vc_dll\wx_vc9_core.bsc"\r
+                               OutputFile="..\..\lib\vc_lib\wx_vc9_core.bsc"\r

                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r


@@ -315,14 +375,16 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r

-                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r

                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r


@@ -331,9 +393,8 @@
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_coredll.pch"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_coredll.pch"\r

-                               AssemblerListingLocation="vc_mswuddll\core\"\r

                                ObjectFile="vc_mswuddll\core\"\r
                                ObjectFile="vc_mswuddll\core\"\r

-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294ud_core_vc_custom.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r


@@ -343,7 +404,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r

                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                        />\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                        />\r


@@ -353,15 +414,15 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r

-                               AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.dll"\r
+                               AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294ud_core_vc_custom.dll"\r

                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_core.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_core.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r

-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294ud_core_vc_custom.pdb"\r

                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r


@@ -386,10 +447,10 @@
                        />\r
                </Configuration>\r
                <Configuration\r
                        />\r
                </Configuration>\r
                <Configuration\r

-                       Name="Universal Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswunivu\core"\r
-                       ConfigurationType="4"\r
+                       Name="DLL Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswudll\core"\r
+                       ConfigurationType="2"\r

                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r


@@ -407,23 +468,24 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r

-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r

                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r

-                               PrecompiledHeaderFile="vc_mswunivu\wxprec_corelib.pch"\r
-                               AssemblerListingLocation="vc_mswunivu\core\"\r
-                               ObjectFile="vc_mswunivu\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_core.pdb"\r
+                               PrecompiledHeaderFile="vc_mswudll\wxprec_coredll.pch"\r
+                               ObjectFile="vc_mswudll\core\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294u_core_vc_custom.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r


@@ -433,17 +495,28 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r

                                Culture="1033"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r

                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r

-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmswuniv29u_core.lib"\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294u_core_vc_custom.dll"\r
+                               LinkIncremental="1"\r
+                               ImportLibrary="..\..\lib\vc_dll\wxmsw29u_core.lib"\r

                                SuppressStartupBanner="true"\r
                                SuppressStartupBanner="true"\r

+                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+                               GenerateManifest="true"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294u_core_vc_custom.pdb"\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r

                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r


@@ -456,7 +529,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r

-                               OutputFile="..\..\lib\vc_lib\wx_vc9_core.bsc"\r
+                               OutputFile="..\..\lib\vc_dll\wx_vc9_core.bsc"\r

                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r


@@ -467,10 +540,10 @@
                        />\r
                </Configuration>\r
                <Configuration\r
                        />\r
                </Configuration>\r
                <Configuration\r

-                       Name="Universal Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswunivud\core"\r
-                       ConfigurationType="4"\r
+                       Name="DLL Universal Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswunivuddll\core"\r
+                       ConfigurationType="2"\r

                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r


@@ -488,14 +561,16 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r

-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r

                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r


@@ -503,10 +578,9 @@
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r

-                               PrecompiledHeaderFile="vc_mswunivud\wxprec_corelib.pch"\r
-                               AssemblerListingLocation="vc_mswunivud\core\"\r
-                               ObjectFile="vc_mswunivud\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_core.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivuddll\wxprec_coredll.pch"\r
+                               ObjectFile="vc_mswunivuddll\core\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294ud_core_vc_custom.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r


@@ -516,17 +590,26 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r

                                Culture="1033"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r

                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r

-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_core.lib"\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294ud_core_vc_custom.dll"\r
+                               LinkIncremental="2"\r
+                               ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_core.lib"\r

                                SuppressStartupBanner="true"\r
                                SuppressStartupBanner="true"\r

+                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+                               GenerateManifest="true"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294ud_core_vc_custom.pdb"\r
+                               TargetMachine="1"\r

                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r


@@ -539,7 +622,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r

-                               OutputFile="..\..\lib\vc_lib\wx_vc9_core.bsc"\r
+                               OutputFile="..\..\lib\vc_dll\wx_vc9_core.bsc"\r

                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r


@@ -550,10 +633,10 @@
                        />\r
                </Configuration>\r
                <Configuration\r
                        />\r
                </Configuration>\r
                <Configuration\r

-                       Name="Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswu\core"\r
-                       ConfigurationType="4"\r
+                       Name="DLL Universal Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswunivudll\core"\r
+                       ConfigurationType="2"\r

                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r


@@ -571,23 +654,24 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r

-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r

                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r

-                               PrecompiledHeaderFile="vc_mswu\wxprec_corelib.pch"\r
-                               AssemblerListingLocation="vc_mswu\core\"\r
-                               ObjectFile="vc_mswu\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_core.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivudll\wxprec_coredll.pch"\r
+                               ObjectFile="vc_mswunivudll\core\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294u_core_vc_custom.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r


@@ -597,100 +681,28 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r

                                Culture="1033"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r

                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r

-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmsw29u_core.lib"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc9_core.bsc"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswud\core"\r
-                       ConfigurationType="4"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
-                       CharacterSet="1"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               AdditionalOptions="/MP"\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
-                               ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
-                               RuntimeTypeInfo="true"\r
-                               UsePrecompiledHeader="2"\r
-                               PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswud\wxprec_corelib.pch"\r
-                               AssemblerListingLocation="vc_mswud\core\"\r
-                               ObjectFile="vc_mswud\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_core.pdb"\r
-                               WarningLevel="4"\r
-                               SuppressStartupBanner="true"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmsw29ud_core.lib"\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294u_core_vc_custom.dll"\r
+                               LinkIncremental="1"\r
+                               ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_core.lib"\r

                                SuppressStartupBanner="true"\r
                                SuppressStartupBanner="true"\r

+                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+                               GenerateManifest="true"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294u_core_vc_custom.pdb"\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r

                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r


@@ -703,7 +715,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r

-                               OutputFile="..\..\lib\vc_lib\wx_vc9_core.bsc"\r
+                               OutputFile="..\..\lib\vc_dll\wx_vc9_core.bsc"\r

                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r


@@ -730,6 +742,10 @@
                                RelativePath="..\..\src\common\accesscmn.cpp"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\src\common\accesscmn.cpp"\r
                                >\r
                        </File>\r

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

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


@@ -746,10 +762,18 @@
                                RelativePath="..\..\src\common\artstd.cpp"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\src\common\artstd.cpp"\r
                                >\r
                        </File>\r

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

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

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

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


@@ -762,6 +786,14 @@
                                RelativePath="..\..\src\common\cairo.cpp"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\src\common\cairo.cpp"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\src\common\checkboxcmn.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\checklstcmn.cpp"\r
+                               >\r
+                       </File>\r

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


@@ -786,6 +818,10 @@
                                RelativePath="..\..\src\common\colourcmn.cpp"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\src\common\colourcmn.cpp"\r
                                >\r
                        </File>\r

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

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


@@ -806,10 +842,6 @@
                                RelativePath="..\..\src\common\ctrlsub.cpp"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\src\common\ctrlsub.cpp"\r
                                >\r
                        </File>\r

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

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


@@ -826,6 +858,10 @@
                                RelativePath="..\..\src\common\dcsvg.cpp"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\src\common\dcsvg.cpp"\r
                                >\r
                        </File>\r

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

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


@@ -858,7 +894,7 @@
                                RelativePath="..\..\src\common\dummy.cpp"\r
                                >\r
                                <FileConfiguration\r
                                RelativePath="..\..\src\common\dummy.cpp"\r
                                >\r
                                <FileConfiguration\r

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

                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r


@@ -866,7 +902,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

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

                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r


@@ -874,7 +910,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

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

                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r


@@ -882,7 +918,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

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

                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r


@@ -890,7 +926,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

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

                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r


@@ -898,7 +934,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

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

                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r


@@ -906,7 +942,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

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

                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r


@@ -914,7 +950,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

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

                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r


@@ -938,6 +974,10 @@
                                RelativePath="..\..\src\common\filectrlcmn.cpp"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\src\common\filectrlcmn.cpp"\r
                                >\r
                        </File>\r

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

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


@@ -950,6 +990,10 @@
                                RelativePath="..\..\src\common\fontcmn.cpp"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\src\common\fontcmn.cpp"\r
                                >\r
                        </File>\r

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

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


@@ -1078,6 +1122,10 @@
                                RelativePath="..\..\src\common\listctrlcmn.cpp"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\src\common\listctrlcmn.cpp"\r
                                >\r
                        </File>\r

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

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


@@ -1086,6 +1134,10 @@
                                RelativePath="..\..\src\common\menucmn.cpp"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\src\common\menucmn.cpp"\r
                                >\r
                        </File>\r

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

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


@@ -1098,10 +1150,22 @@
                                RelativePath="..\..\src\common\overlaycmn.cpp"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\src\common\overlaycmn.cpp"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\src\common\ownerdrwcmn.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\panelcmn.cpp"\r
+                               >\r
+                       </File>\r

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

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

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


@@ -1118,6 +1182,10 @@
                                RelativePath="..\..\src\common\quantize.cpp"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\src\common\quantize.cpp"\r
                                >\r
                        </File>\r

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

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


@@ -1134,6 +1202,10 @@
                                RelativePath="..\..\src\common\rgncmn.cpp"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\src\common\rgncmn.cpp"\r
                                >\r
                        </File>\r

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

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


@@ -1142,6 +1214,18 @@
                                RelativePath="..\..\src\common\sizer.cpp"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\src\common\sizer.cpp"\r
                                >\r
                        </File>\r

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

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


@@ -1150,6 +1234,18 @@
                                RelativePath="..\..\src\common\statbar.cpp"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\src\common\statbar.cpp"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\src\common\statbmpcmn.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\statboxcmn.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\statlinecmn.cpp"\r
+                               >\r
+                       </File>\r

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


@@ -1178,6 +1274,10 @@
                                RelativePath="..\..\src\common\treebase.cpp"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\src\common\treebase.cpp"\r
                                >\r
                        </File>\r

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

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


@@ -1190,6 +1290,10 @@
                                RelativePath="..\..\src\common\validate.cpp"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\src\common\validate.cpp"\r
                                >\r
                        </File>\r

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

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


@@ -1219,19 +1323,51 @@
                                RelativePath="..\..\src\msw\accel.cpp"\r
                                >\r
                                <FileConfiguration\r
                                RelativePath="..\..\src\msw\accel.cpp"\r
                                >\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_accel.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_accel.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r

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

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

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

-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_accel.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_accel.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r

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

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

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


@@ -1239,97 +1375,185 @@
                                RelativePath="..\..\src\msw\ole\access.cpp"\r
                                >\r
                                <FileConfiguration\r
                                RelativePath="..\..\src\msw\ole\access.cpp"\r
                                >\r
                                <FileConfiguration\r

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

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

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

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

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

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

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

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

-                               RelativePath="..\..\src\msw\app.cpp"\r
+                               RelativePath="..\..\src\msw\ole\activex.cpp"\r

                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\msw\artmsw.cpp"\r
+                               RelativePath="..\..\src\msw\anybutton.cpp"\r

                                >\r
                                <FileConfiguration\r
                                >\r
                                <FileConfiguration\r

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

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

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

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

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

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

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

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

-                               RelativePath="..\..\src\msw\ole\automtn.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\bitmap.cpp"\r
+                               RelativePath="..\..\src\msw\app.cpp"\r

                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\msw\bmpbuttn.cpp"\r
+                               RelativePath="..\..\src\msw\artmsw.cpp"\r

                                >\r
                                <FileConfiguration\r
                                >\r
                                <FileConfiguration\r

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

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

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

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

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

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

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

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

-                               RelativePath="..\..\src\msw\brush.cpp"\r
+                               RelativePath="..\..\src\msw\ole\automtn.cpp"\r

                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\msw\button.cpp"\r
+                               RelativePath="..\..\src\msw\bitmap.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\bmpbuttn.cpp"\r

                                >\r
                                <FileConfiguration\r
                                >\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_bmpbuttn.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_bmpbuttn.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r

                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                        Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                        Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r

+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_bmpbuttn.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_bmpbuttn.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\brush.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\button.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_button.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_button.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                        Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                        Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r

+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_button.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_button.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\caret.cpp"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\caret.cpp"\r


@@ -1339,19 +1563,51 @@
                                RelativePath="..\..\src\msw\checkbox.cpp"\r
                                >\r
                                <FileConfiguration\r
                                RelativePath="..\..\src\msw\checkbox.cpp"\r
                                >\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_checkbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_checkbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r

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

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

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

-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_checkbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_checkbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r

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

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

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


@@ -1359,19 +1615,51 @@
                                RelativePath="..\..\src\msw\checklst.cpp"\r
                                >\r
                                <FileConfiguration\r
                                RelativePath="..\..\src\msw\checklst.cpp"\r
                                >\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_checklst.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_checklst.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r

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

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

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

-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_checklst.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_checklst.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r

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

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

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


@@ -1379,19 +1667,51 @@
                                RelativePath="..\..\src\msw\choice.cpp"\r
                                >\r
                                <FileConfiguration\r
                                RelativePath="..\..\src\msw\choice.cpp"\r
                                >\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_choice.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_choice.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r

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

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

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

-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_choice.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_choice.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r

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

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

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


@@ -1403,19 +1723,19 @@
                                RelativePath="..\..\src\msw\colordlg.cpp"\r
                                >\r
                                <FileConfiguration\r
                                RelativePath="..\..\src\msw\colordlg.cpp"\r
                                >\r
                                <FileConfiguration\r

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

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

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

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

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

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

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

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


@@ -1427,19 +1747,19 @@
                                RelativePath="..\..\src\msw\combo.cpp"\r
                                >\r
                                <FileConfiguration\r
                                RelativePath="..\..\src\msw\combo.cpp"\r
                                >\r
                                <FileConfiguration\r

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

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

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

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

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

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

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

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


@@ -1447,11 +1767,23 @@
                                RelativePath="..\..\src\msw\combobox.cpp"\r
                                >\r
                                <FileConfiguration\r
                                RelativePath="..\..\src\msw\combobox.cpp"\r
                                >\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_combobox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_combobox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r

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


@@ -1459,32 +1791,84 @@
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r

-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\control.cpp"\r
-                               >\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_combobox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_combobox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                        Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                <FileConfiguration\r
                                        Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r

-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r

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

-                               RelativePath="..\..\src\msw\cursor.cpp"\r
+                               RelativePath="..\..\src\msw\control.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_control.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_control.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_control.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_control.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\cursor.cpp"\r

                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r


@@ -1519,19 +1903,51 @@
                                RelativePath="..\..\src\msw\dialog.cpp"\r
                                >\r
                                <FileConfiguration\r
                                RelativePath="..\..\src\msw\dialog.cpp"\r
                                >\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_dialog.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_dialog.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r

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

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

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

-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_dialog.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_dialog.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r

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

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

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


@@ -1547,19 +1963,19 @@
                                RelativePath="..\..\src\msw\dirdlg.cpp"\r
                                >\r
                                <FileConfiguration\r
                                RelativePath="..\..\src\msw\dirdlg.cpp"\r
                                >\r
                                <FileConfiguration\r

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

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

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

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

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

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

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

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


@@ -1571,19 +1987,19 @@
                                RelativePath="..\..\src\msw\dragimag.cpp"\r
                                >\r
                                <FileConfiguration\r
                                RelativePath="..\..\src\msw\dragimag.cpp"\r
                                >\r
                                <FileConfiguration\r

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

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

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

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

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

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

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

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


@@ -1607,19 +2023,51 @@
                                RelativePath="..\..\src\msw\fdrepdlg.cpp"\r
                                >\r
                                <FileConfiguration\r
                                RelativePath="..\..\src\msw\fdrepdlg.cpp"\r
                                >\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_fdrepdlg.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_fdrepdlg.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r

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

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

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

-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_fdrepdlg.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_fdrepdlg.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r

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

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

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


@@ -1627,19 +2075,19 @@
                                RelativePath="..\..\src\msw\filedlg.cpp"\r
                                >\r
                                <FileConfiguration\r
                                RelativePath="..\..\src\msw\filedlg.cpp"\r
                                >\r
                                <FileConfiguration\r

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

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

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

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

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

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

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

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


@@ -1651,19 +2099,19 @@
                                RelativePath="..\..\src\msw\fontdlg.cpp"\r
                                >\r
                                <FileConfiguration\r
                                RelativePath="..\..\src\msw\fontdlg.cpp"\r
                                >\r
                                <FileConfiguration\r

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

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

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

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

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

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

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

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


@@ -1679,19 +2127,19 @@
                                RelativePath="..\..\src\msw\frame.cpp"\r
                                >\r
                                <FileConfiguration\r
                                RelativePath="..\..\src\msw\frame.cpp"\r
                                >\r
                                <FileConfiguration\r

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

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

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

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

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

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

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

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


@@ -1699,19 +2147,51 @@
                                RelativePath="..\..\src\msw\gauge.cpp"\r
                                >\r
                                <FileConfiguration\r
                                RelativePath="..\..\src\msw\gauge.cpp"\r
                                >\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_gauge.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_gauge.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r

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

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

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

-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_gauge.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_gauge.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r

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

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

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


@@ -1735,19 +2215,19 @@
                                RelativePath="..\..\src\msw\headerctrl.cpp"\r
                                >\r
                                <FileConfiguration\r
                                RelativePath="..\..\src\msw\headerctrl.cpp"\r
                                >\r
                                <FileConfiguration\r

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

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

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

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

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

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

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

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


@@ -1771,19 +2251,19 @@
                                RelativePath="..\..\src\msw\iniconf.cpp"\r
                                >\r
                                <FileConfiguration\r
                                RelativePath="..\..\src\msw\iniconf.cpp"\r
                                >\r
                                <FileConfiguration\r

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

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

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

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

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

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

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

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


@@ -1791,11 +2271,23 @@
                                RelativePath="..\..\src\msw\listbox.cpp"\r
                                >\r
                                <FileConfiguration\r
                                RelativePath="..\..\src\msw\listbox.cpp"\r
                                >\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_listbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_listbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r

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


@@ -1803,29 +2295,81 @@
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r

-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\listctrl.cpp"\r
-                               >\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_listbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_listbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                        Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                <FileConfiguration\r
                                        Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r

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

                                        ExcludedFromBuild="true"\r
                                />\r
                                        ExcludedFromBuild="true"\r
                                />\r

-                               <FileConfiguration\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\listctrl.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_listctrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_listctrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r

                                        Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                        Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r

+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_listctrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_listctrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\main.cpp"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\main.cpp"\r


@@ -1835,19 +2379,19 @@
                                RelativePath="..\..\src\msw\mdi.cpp"\r
                                >\r
                                <FileConfiguration\r
                                RelativePath="..\..\src\msw\mdi.cpp"\r
                                >\r
                                <FileConfiguration\r

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

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

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

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

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

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

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

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


@@ -1855,19 +2399,51 @@
                                RelativePath="..\..\src\msw\menu.cpp"\r
                                >\r
                                <FileConfiguration\r
                                RelativePath="..\..\src\msw\menu.cpp"\r
                                >\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_menu.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_menu.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r

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

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

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

-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_menu.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_menu.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r

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

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

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


@@ -1875,19 +2451,19 @@
                                RelativePath="..\..\src\msw\menuitem.cpp"\r
                                >\r
                                <FileConfiguration\r
                                RelativePath="..\..\src\msw\menuitem.cpp"\r
                                >\r
                                <FileConfiguration\r

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

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

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

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

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

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

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

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


@@ -1895,19 +2471,19 @@
                                RelativePath="..\..\src\msw\metafile.cpp"\r
                                >\r
                                <FileConfiguration\r
                                RelativePath="..\..\src\msw\metafile.cpp"\r
                                >\r
                                <FileConfiguration\r

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

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

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

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

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

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

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

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


@@ -1919,19 +2495,19 @@
                                RelativePath="..\..\src\msw\msgdlg.cpp"\r
                                >\r
                                <FileConfiguration\r
                                RelativePath="..\..\src\msw\msgdlg.cpp"\r
                                >\r
                                <FileConfiguration\r

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

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

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

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

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

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

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

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


@@ -1943,19 +2519,19 @@
                                RelativePath="..\..\src\msw\nativdlg.cpp"\r
                                >\r
                                <FileConfiguration\r
                                RelativePath="..\..\src\msw\nativdlg.cpp"\r
                                >\r
                                <FileConfiguration\r

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

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

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

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

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

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

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

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


@@ -1963,39 +2539,75 @@
                                RelativePath="..\..\src\msw\nativewin.cpp"\r
                                >\r
                                <FileConfiguration\r
                                RelativePath="..\..\src\msw\nativewin.cpp"\r
                                >\r
                                <FileConfiguration\r

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

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

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

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

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

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

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

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

+                       <File\r
+                               RelativePath="..\..\src\msw\nonownedwnd.cpp"\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\msw\notebook.cpp"\r
                                >\r
                                <FileConfiguration\r
                        <File\r
                                RelativePath="..\..\src\msw\notebook.cpp"\r
                                >\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_notebook.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_notebook.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r

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

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

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

-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_notebook.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_notebook.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r

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

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

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


@@ -2007,19 +2619,19 @@
                                RelativePath="..\..\src\msw\ownerdrw.cpp"\r
                                >\r
                                <FileConfiguration\r
                                RelativePath="..\..\src\msw\ownerdrw.cpp"\r
                                >\r
                                <FileConfiguration\r

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

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

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

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

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

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

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

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


@@ -2027,6 +2639,26 @@
                                RelativePath="..\..\src\msw\palette.cpp"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\src\msw\palette.cpp"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\src\msw\panel.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\msw\pen.cpp"\r
                                >\r
                        <File\r
                                RelativePath="..\..\src\msw\pen.cpp"\r
                                >\r


@@ -2044,34 +2676,46 @@
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\msw\radiobox.cpp"\r
+                               RelativePath="..\..\src\msw\progdlg.cpp"\r

                                >\r
                                <FileConfiguration\r
                                >\r
                                <FileConfiguration\r

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

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

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

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

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

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

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

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

-                               RelativePath="..\..\src\msw\radiobut.cpp"\r
+                               RelativePath="..\..\src\msw\radiobox.cpp"\r

                                >\r
                                <FileConfiguration\r
                                >\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_radiobox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_radiobox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r

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


@@ -2079,51 +2723,51 @@
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r

-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\region.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\renderer.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\scrolbar.cpp"\r
-                               >\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_radiobox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_radiobox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                        Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                <FileConfiguration\r
                                        Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r

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

                                        ExcludedFromBuild="true"\r
                                />\r
                                        ExcludedFromBuild="true"\r
                                />\r

-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\settings.cpp"\r
-                               >\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\msw\slider.cpp"\r
+                               RelativePath="..\..\src\msw\radiobut.cpp"\r

                                >\r
                                <FileConfiguration\r
                                >\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_radiobut.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_radiobut.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r

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


@@ -2131,59 +2775,79 @@
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r

-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\spinbutt.cpp"\r
-                               >\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_radiobut.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_radiobut.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                        Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                <FileConfiguration\r
                                        Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r

-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r

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

-                               RelativePath="..\..\src\msw\spinctrl.cpp"\r
+                               RelativePath="..\..\src\msw\region.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\renderer.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\richmsgdlg.cpp"\r

                                >\r
                                <FileConfiguration\r
                                >\r
                                <FileConfiguration\r

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

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

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

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

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

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

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

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

-                               RelativePath="..\..\src\msw\statbmp.cpp"\r
+                               RelativePath="..\..\src\msw\scrolbar.cpp"\r

                                >\r
                                <FileConfiguration\r
                                >\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_scrolbar.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_scrolbar.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r

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


@@ -2191,39 +2855,55 @@
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r

-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\statbox.cpp"\r
-                               >\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_scrolbar.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_scrolbar.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                        Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                <FileConfiguration\r
                                        Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r

-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r

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

-                               RelativePath="..\..\src\msw\statline.cpp"\r
+                               RelativePath="..\..\src\msw\settings.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\slider.cpp"\r

                                >\r
                                <FileConfiguration\r
                                >\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_slider.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_slider.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r

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


@@ -2231,39 +2911,51 @@
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r

-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\stattext.cpp"\r
-                               >\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_slider.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_slider.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                        Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                <FileConfiguration\r
                                        Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r

-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r

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

-                               RelativePath="..\..\src\msw\statusbar.cpp"\r
+                               RelativePath="..\..\src\msw\spinbutt.cpp"\r

                                >\r
                                <FileConfiguration\r
                                >\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_spinbutt.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_spinbutt.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r

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


@@ -2271,59 +2963,71 @@
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r

-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\textctrl.cpp"\r
-                               >\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_spinbutt.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_spinbutt.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                        Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                <FileConfiguration\r
                                        Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r

-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r

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

-                               RelativePath="..\..\src\msw\textentry.cpp"\r
+                               RelativePath="..\..\src\msw\spinctrl.cpp"\r

                                >\r
                                <FileConfiguration\r
                                >\r
                                <FileConfiguration\r

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

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

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

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

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

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

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

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

-                               RelativePath="..\..\src\msw\tglbtn.cpp"\r
+                               RelativePath="..\..\src\msw\statbmp.cpp"\r

                                >\r
                                <FileConfiguration\r
                                >\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_statbmp.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_statbmp.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r

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


@@ -2331,541 +3035,1505 @@
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r

-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\toolbar.cpp"\r
-                               >\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_statbmp.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_statbmp.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                        Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                <FileConfiguration\r
                                        Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r

-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r

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

-                               RelativePath="..\..\src\msw\tooltip.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\toplevel.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\treectrl.cpp"\r
+                               RelativePath="..\..\src\msw\statbox.cpp"\r

                                >\r
                                <FileConfiguration\r
                                >\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_statbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                <FileConfiguration\r

-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_statbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                        Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                        Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r

-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\utilsgui.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\ole\uuid.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\uxtheme.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\version.rc"\r
-                               >\r

                                <FileConfiguration\r
                                        Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                <FileConfiguration\r
                                        Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r

-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_statbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                <FileConfiguration\r

-                                       Name="Release|Win32"\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_statbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r

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

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

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

-                               RelativePath="..\..\src\msw\volume.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\window.cpp"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="Generic Sources"\r
-                       UniqueIdentifier="{FEA0C02F-F300-53BA-B784-52A5086B8093}"\r
-                       >\r
-                       <File\r
-                               RelativePath="..\..\src\generic\accel.cpp"\r
+                               RelativePath="..\..\src\msw\statline.cpp"\r

                                >\r
                                <FileConfiguration\r
                                >\r
                                <FileConfiguration\r

-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_statline.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                        Name="Release|Win32"\r
                                <FileConfiguration\r
                                        Name="Release|Win32"\r

-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_statline.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                <FileConfiguration\r

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

                                        ExcludedFromBuild="true"\r
                                />\r
                                        ExcludedFromBuild="true"\r
                                />\r

-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\busyinfo.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\buttonbar.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\choicbkg.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\choicdgg.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\clrpickerg.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\collpaneg.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\colrdlgg.cpp"\r
-                               >\r

                                <FileConfiguration\r
                                <FileConfiguration\r

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

                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                        Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                        Name="DLL Debug|Win32"\r

-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_statline.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                <FileConfiguration\r

-                                       Name="Release|Win32"\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_statline.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r

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

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

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

-                               RelativePath="..\..\src\generic\combog.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\dcpsg.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\dirctrlg.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\dirdlgg.cpp"\r
+                               RelativePath="..\..\src\msw\stattext.cpp"\r

                                >\r
                                <FileConfiguration\r
                                >\r
                                <FileConfiguration\r

-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_stattext.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                        Name="Release|Win32"\r
                                <FileConfiguration\r
                                        Name="Release|Win32"\r

-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_stattext.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                <FileConfiguration\r

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

                                        ExcludedFromBuild="true"\r
                                />\r
                                        ExcludedFromBuild="true"\r
                                />\r

-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\dragimgg.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\fdrepdlg.cpp"\r
-                               >\r

                                <FileConfiguration\r
                                <FileConfiguration\r

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

                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                        Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                        Name="DLL Debug|Win32"\r

-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_stattext.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                <FileConfiguration\r

-                                       Name="Release|Win32"\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_stattext.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r

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

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

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

-                               RelativePath="..\..\src\generic\filectrlg.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\filedlgg.cpp"\r
+                               RelativePath="..\..\src\msw\statusbar.cpp"\r

                                >\r
                                <FileConfiguration\r
                                >\r
                                <FileConfiguration\r

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

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

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

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

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

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

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

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

-                               RelativePath="..\..\src\generic\filepickerg.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\fontdlgg.cpp"\r
+                               RelativePath="..\..\src\msw\textctrl.cpp"\r

                                >\r
                                <FileConfiguration\r
                                >\r
                                <FileConfiguration\r

-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_textctrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_textctrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r

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

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

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

-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_textctrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_textctrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r

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

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

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

-                               RelativePath="..\..\src\generic\fontpickerg.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\headerctrlg.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\listbkg.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\listctrl.cpp"\r
+                               RelativePath="..\..\src\msw\textentry.cpp"\r

                                >\r
                                <FileConfiguration\r
                                >\r
                                <FileConfiguration\r

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

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

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

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

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

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

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

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

-                               RelativePath="..\..\src\generic\logg.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\mdig.cpp"\r
+                               RelativePath="..\..\src\msw\tglbtn.cpp"\r

                                >\r
                                <FileConfiguration\r
                                >\r
                                <FileConfiguration\r

-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_tglbtn.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_tglbtn.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r

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

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

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

-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_tglbtn.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_tglbtn.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r

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

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

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

-                               RelativePath="..\..\src\generic\msgdlgg.cpp"\r
+                               RelativePath="..\..\src\msw\toolbar.cpp"\r

                                >\r
                                <FileConfiguration\r
                                >\r
                                <FileConfiguration\r

-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_toolbar.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_toolbar.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r

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

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

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

-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_toolbar.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_toolbar.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r

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

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

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

-                               RelativePath="..\..\src\generic\numdlgg.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\panelg.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\printps.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\prntdlgg.cpp"\r
+                               RelativePath="..\..\src\msw\tooltip.cpp"\r

                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\generic\progdlgg.cpp"\r
+                               RelativePath="..\..\src\msw\toplevel.cpp"\r

                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\generic\renderg.cpp"\r
+                               RelativePath="..\..\src\msw\treectrl.cpp"\r

                                >\r
                                >\r

+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\generic\scrlwing.cpp"\r
+                               RelativePath="..\..\src\msw\uiaction.cpp"\r

                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\generic\selstore.cpp"\r
+                               RelativePath="..\..\src\msw\utilsgui.cpp"\r

                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\generic\spinctlg.cpp"\r
+                               RelativePath="..\..\src\msw\ole\uuid.cpp"\r

                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\generic\splitter.cpp"\r
+                               RelativePath="..\..\src\msw\uxtheme.cpp"\r

                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\generic\srchctlg.cpp"\r
+                               RelativePath="..\..\src\msw\version.rc"\r

                                >\r
                                >\r

+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\generic\statbmpg.cpp"\r
+                               RelativePath="..\..\src\msw\volume.cpp"\r

                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\generic\stattextg.cpp"\r
+                               RelativePath="..\..\src\msw\window.cpp"\r

                                >\r
                        </File>\r
                                >\r
                        </File>\r

+               </Filter>\r
+               <Filter\r
+                       Name="Generic Sources"\r
+                       UniqueIdentifier="{FEA0C02F-F300-53BA-B784-52A5086B8093}"\r
+                       >\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\generic\statusbr.cpp"\r
+                               RelativePath="..\..\src\generic\accel.cpp"\r

                                >\r
                                <FileConfiguration\r
                                >\r
                                <FileConfiguration\r

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

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

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

                                        ExcludedFromBuild="true"\r
                                />\r
                                        ExcludedFromBuild="true"\r
                                />\r

+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\generic_accel.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                        Name="Universal Release|Win32"\r
                                <FileConfiguration\r
                                        Name="Universal Release|Win32"\r

+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\generic_accel.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r

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

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

                                        ExcludedFromBuild="true"\r
                                />\r
                                        ExcludedFromBuild="true"\r
                                />\r

+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\generic_accel.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\generic_accel.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\generic\textdlgg.cpp"\r
+                               RelativePath="..\..\src\generic\busyinfo.cpp"\r

                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\generic\tipwin.cpp"\r
+                               RelativePath="..\..\src\generic\buttonbar.cpp"\r

                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\generic\toolbkg.cpp"\r
+                               RelativePath="..\..\src\generic\choicbkg.cpp"\r

                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\generic\treebkg.cpp"\r
+                               RelativePath="..\..\src\generic\choicdgg.cpp"\r

                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\generic\treectlg.cpp"\r
+                               RelativePath="..\..\src\generic\clrpickerg.cpp"\r

                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\generic\vlbox.cpp"\r
+                               RelativePath="..\..\src\generic\collpaneg.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\colrdlgg.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\combog.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\dcpsg.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\dirctrlg.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\dirdlgg.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\dragimgg.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\fdrepdlg.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\generic_fdrepdlg.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\generic_fdrepdlg.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\generic_fdrepdlg.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\generic_fdrepdlg.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\filectrlg.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\filedlgg.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\filepickerg.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\fontdlgg.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\fontpickerg.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\graphicc.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\headerctrlg.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\infobar.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\listbkg.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\listctrl.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\generic_listctrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\generic_listctrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\generic_listctrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\generic_listctrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\logg.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\markuptext.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\mdig.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\msgdlgg.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\numdlgg.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\printps.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\prntdlgg.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\progdlgg.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\renderg.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\richmsgdlgg.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\scrlwing.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\selstore.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\spinctlg.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\splitter.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\srchctlg.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\statbmpg.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\stattextg.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\statusbr.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\generic_statusbr.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\generic_statusbr.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\generic_statusbr.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\generic_statusbr.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\textdlgg.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\tipwin.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\toolbkg.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\treebkg.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\treectlg.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\vlbox.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\vscroll.cpp"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="wxUniv Sources"\r
+                       UniqueIdentifier="{6F354595-5EA6-5848-AAA1-6C4820DE7AEE}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\src\univ\bmpbuttn.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_bmpbuttn.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_bmpbuttn.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_bmpbuttn.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_bmpbuttn.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\univ\button.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_button.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_button.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_button.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_button.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\univ\checkbox.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_checkbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_checkbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_checkbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_checkbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\univ\checklst.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_checklst.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_checklst.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_checklst.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_checklst.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\univ\choice.cpp"\r

                                >\r
                                >\r

+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_choice.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_choice.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_choice.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_choice.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\generic\vscroll.cpp"\r
+                               RelativePath="..\..\src\univ\combobox.cpp"\r

                                >\r
                                >\r

+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_combobox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_combobox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_combobox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_combobox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                        </File>\r
                        </File>\r

-               </Filter>\r
-               <Filter\r
-                       Name="wxUniv Sources"\r
-                       UniqueIdentifier="{6F354595-5EA6-5848-AAA1-6C4820DE7AEE}"\r
-                       >\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\univ\bmpbuttn.cpp"\r
+                               RelativePath="..\..\src\univ\control.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_control.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_control.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_control.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_control.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\univ\ctrlrend.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\univ\dialog.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_dialog.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_dialog.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_dialog.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_dialog.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\univ\framuniv.cpp"\r

                                >\r
                                >\r

+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r

                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r

+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\univ\gauge.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_gauge.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_gauge.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                        Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                <FileConfiguration\r
                                        Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r

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

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

-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_gauge.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_gauge.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\univ\button.cpp"\r
+                               RelativePath="..\..\src\univ\themes\gtk.cpp"\r

                                >\r
                                <FileConfiguration\r
                                >\r
                                <FileConfiguration\r

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

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

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

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

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

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

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

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

-                               RelativePath="..\..\src\univ\checkbox.cpp"\r
+                               RelativePath="..\..\src\univ\inpcons.cpp"\r

                                >\r
                                <FileConfiguration\r
                                >\r
                                <FileConfiguration\r

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

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

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

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

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

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

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

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

-                               RelativePath="..\..\src\univ\checklst.cpp"\r
+                               RelativePath="..\..\src\univ\inphand.cpp"\r

                                >\r
                                <FileConfiguration\r
                                >\r
                                <FileConfiguration\r

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

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

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

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

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

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

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

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

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

                                >\r
                                <FileConfiguration\r
                                >\r
                                <FileConfiguration\r

-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Debug|Win32"\r

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


@@ -2873,139 +4541,247 @@
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r

-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\combobox.cpp"\r
-                               >\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_listbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                <FileConfiguration\r

-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_listbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                        Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                <FileConfiguration\r
                                        Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r

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

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

-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_listbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_listbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\univ\control.cpp"\r
+                               RelativePath="..\..\src\univ\menu.cpp"\r

                                >\r
                                <FileConfiguration\r
                                >\r
                                <FileConfiguration\r

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

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

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

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

-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_menu.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_menu.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r

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

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

                                        ExcludedFromBuild="true"\r
                                />\r
                                        ExcludedFromBuild="true"\r
                                />\r

+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_menu.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_menu.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\univ\ctrlrend.cpp"\r
+                               RelativePath="..\..\src\univ\themes\metal.cpp"\r

                                >\r
                                <FileConfiguration\r
                                >\r
                                <FileConfiguration\r

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

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

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

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

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

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

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

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

-                               RelativePath="..\..\src\univ\dialog.cpp"\r
+                               RelativePath="..\..\src\univ\themes\mono.cpp"\r

                                >\r
                                <FileConfiguration\r
                                >\r
                                <FileConfiguration\r

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

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

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

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

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

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

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

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

-                               RelativePath="..\..\src\univ\framuniv.cpp"\r
+                               RelativePath="..\..\src\univ\notebook.cpp"\r

                                >\r
                                <FileConfiguration\r
                                >\r
                                <FileConfiguration\r

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

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

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

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

-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_notebook.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_notebook.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r

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

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

                                        ExcludedFromBuild="true"\r
                                />\r
                                        ExcludedFromBuild="true"\r
                                />\r

+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_notebook.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_notebook.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\univ\gauge.cpp"\r
+                               RelativePath="..\..\src\univ\radiobox.cpp"\r

                                >\r
                                <FileConfiguration\r
                                >\r
                                <FileConfiguration\r

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

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

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

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

-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_radiobox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_radiobox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r

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

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

                                        ExcludedFromBuild="true"\r
                                />\r
                                        ExcludedFromBuild="true"\r
                                />\r

+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_radiobox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_radiobox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\univ\themes\gtk.cpp"\r
+                               RelativePath="..\..\src\univ\radiobut.cpp"\r

                                >\r
                                <FileConfiguration\r
                                >\r
                                <FileConfiguration\r

-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Debug|Win32"\r

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


@@ -3013,59 +4789,71 @@
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r

-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\inpcons.cpp"\r
-                               >\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_radiobut.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                <FileConfiguration\r

-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_radiobut.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                        Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                <FileConfiguration\r
                                        Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r

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

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

-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_radiobut.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_radiobut.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\univ\inphand.cpp"\r
+                               RelativePath="..\..\src\univ\scrarrow.cpp"\r

                                >\r
                                <FileConfiguration\r
                                >\r
                                <FileConfiguration\r

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

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

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

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

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

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

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

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

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

                                >\r
                                <FileConfiguration\r
                                >\r
                                <FileConfiguration\r

-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Debug|Win32"\r

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


@@ -3073,79 +4861,91 @@
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r

-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\menu.cpp"\r
-                               >\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_scrolbar.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                <FileConfiguration\r

-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_scrolbar.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                        Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                <FileConfiguration\r
                                        Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r

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

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

-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_scrolbar.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_scrolbar.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\univ\themes\metal.cpp"\r
+                               RelativePath="..\..\src\univ\scrthumb.cpp"\r

                                >\r
                                <FileConfiguration\r
                                >\r
                                <FileConfiguration\r

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

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

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

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

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

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

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

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

-                               RelativePath="..\..\src\univ\themes\mono.cpp"\r
+                               RelativePath="..\..\src\univ\settingsuniv.cpp"\r

                                >\r
                                <FileConfiguration\r
                                >\r
                                <FileConfiguration\r

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

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

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

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

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

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

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

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

-                               RelativePath="..\..\src\univ\notebook.cpp"\r
+                               RelativePath="..\..\src\univ\slider.cpp"\r

                                >\r
                                <FileConfiguration\r
                                >\r
                                <FileConfiguration\r

-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Debug|Win32"\r

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


@@ -3153,39 +4953,51 @@
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r

-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\radiobox.cpp"\r
-                               >\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_slider.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                <FileConfiguration\r

-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_slider.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                        Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                <FileConfiguration\r
                                        Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r

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

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

-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_slider.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_slider.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\univ\radiobut.cpp"\r
+                               RelativePath="..\..\src\univ\spinbutt.cpp"\r

                                >\r
                                <FileConfiguration\r
                                >\r
                                <FileConfiguration\r

-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Debug|Win32"\r

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


@@ -3193,79 +5005,155 @@
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r

-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\scrarrow.cpp"\r
-                               >\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_spinbutt.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                <FileConfiguration\r

-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_spinbutt.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                        Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                <FileConfiguration\r
                                        Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r

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

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

-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_spinbutt.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_spinbutt.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\univ\scrolbar.cpp"\r
+                               RelativePath="..\..\src\univ\statbmp.cpp"\r

                                >\r
                                <FileConfiguration\r
                                >\r
                                <FileConfiguration\r

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

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

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

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

-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_statbmp.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_statbmp.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r

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

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

                                        ExcludedFromBuild="true"\r
                                />\r
                                        ExcludedFromBuild="true"\r
                                />\r

+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_statbmp.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_statbmp.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

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

                                >\r
                                <FileConfiguration\r
                                >\r
                                <FileConfiguration\r

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

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

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

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

-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_statbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_statbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r

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

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

                                        ExcludedFromBuild="true"\r
                                />\r
                                        ExcludedFromBuild="true"\r
                                />\r

+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_statbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_statbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\univ\settingsuniv.cpp"\r
+                               RelativePath="..\..\src\univ\statline.cpp"\r

                                >\r
                                <FileConfiguration\r
                                >\r
                                <FileConfiguration\r

-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Debug|Win32"\r

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


@@ -3273,39 +5161,51 @@
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r

-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\slider.cpp"\r
-                               >\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_statline.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                <FileConfiguration\r

-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_statline.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                        Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                <FileConfiguration\r
                                        Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r

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

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

-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_statline.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_statline.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\univ\spinbutt.cpp"\r
+                               RelativePath="..\..\src\univ\stattext.cpp"\r

                                >\r
                                <FileConfiguration\r
                                >\r
                                <FileConfiguration\r

-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Debug|Win32"\r

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


@@ -3313,39 +5213,51 @@
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r

-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\statbmp.cpp"\r
-                               >\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_stattext.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                <FileConfiguration\r

-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_stattext.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                        Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                <FileConfiguration\r
                                        Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r

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

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

-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_stattext.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_stattext.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\univ\statbox.cpp"\r
+                               RelativePath="..\..\src\univ\statusbr.cpp"\r

                                >\r
                                <FileConfiguration\r
                                >\r
                                <FileConfiguration\r

-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Debug|Win32"\r

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


@@ -3353,59 +5265,71 @@
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r

-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\statline.cpp"\r
-                               >\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_statusbr.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                <FileConfiguration\r

-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_statusbr.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                        Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                <FileConfiguration\r
                                        Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r

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

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

-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_statusbr.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_statusbr.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\univ\stattext.cpp"\r
+                               RelativePath="..\..\src\univ\stdrend.cpp"\r

                                >\r
                                <FileConfiguration\r
                                >\r
                                <FileConfiguration\r

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

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

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

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

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

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

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

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

-                               RelativePath="..\..\src\univ\statusbr.cpp"\r
+                               RelativePath="..\..\src\univ\textctrl.cpp"\r

                                >\r
                                <FileConfiguration\r
                                >\r
                                <FileConfiguration\r

-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Debug|Win32"\r

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


@@ -3413,79 +5337,123 @@
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r

-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\stdrend.cpp"\r
-                               >\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_textctrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                <FileConfiguration\r

-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_textctrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                        Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                <FileConfiguration\r
                                        Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r

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

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

-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_textctrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_textctrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\univ\textctrl.cpp"\r
+                               RelativePath="..\..\src\univ\tglbtn.cpp"\r

                                >\r
                                <FileConfiguration\r
                                >\r
                                <FileConfiguration\r

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

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

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

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

-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_tglbtn.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_tglbtn.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r

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

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

                                        ExcludedFromBuild="true"\r
                                />\r
                                        ExcludedFromBuild="true"\r
                                />\r

+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_tglbtn.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_tglbtn.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\univ\tglbtn.cpp"\r
+                               RelativePath="..\..\src\univ\theme.cpp"\r

                                >\r
                                <FileConfiguration\r
                                >\r
                                <FileConfiguration\r

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

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

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

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

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

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

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

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

-                               RelativePath="..\..\src\univ\theme.cpp"\r
+                               RelativePath="..\..\src\univ\toolbar.cpp"\r

                                >\r
                                <FileConfiguration\r
                                >\r
                                <FileConfiguration\r

-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Debug|Win32"\r

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


@@ -3493,47 +5461,63 @@
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r

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

                                <FileConfiguration\r
                                <FileConfiguration\r

-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_toolbar.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                                <FileConfiguration\r
                                        Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                <FileConfiguration\r
                                        Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r

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

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

-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_toolbar.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_toolbar.obj"\r
+                                       />\r
+                               </FileConfiguration>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\topluniv.cpp"\r
                                >\r
                                <FileConfiguration\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\topluniv.cpp"\r
                                >\r
                                <FileConfiguration\r

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

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

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

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

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

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

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

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


@@ -3541,19 +5525,19 @@
                                RelativePath="..\..\src\univ\themes\win32.cpp"\r
                                >\r
                                <FileConfiguration\r
                                RelativePath="..\..\src\univ\themes\win32.cpp"\r
                                >\r
                                <FileConfiguration\r

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

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

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

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

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

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

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

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


@@ -3561,19 +5545,19 @@
                                RelativePath="..\..\src\univ\winuniv.cpp"\r
                                >\r
                                <FileConfiguration\r
                                RelativePath="..\..\src\univ\winuniv.cpp"\r
                                >\r
                                <FileConfiguration\r

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

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

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

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

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

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

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

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


@@ -3586,121 +5570,113 @@
                                RelativePath="..\..\include\wx\msw\setup.h"\r
                                >\r
                                <FileConfiguration\r
                                RelativePath="..\..\include\wx\msw\setup.h"\r
                                >\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Release|Win32"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r

                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswu\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswud\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"\r

                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

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

                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswud\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswu\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"\r

                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

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

                                />\r
                                <FileConfiguration\r
                                />\r
                                <FileConfiguration\r

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

                                />\r
                                <FileConfiguration\r
                                />\r
                                <FileConfiguration\r

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

                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswu\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswud\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"\r

                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

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

                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswud\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswu\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"\r

                                        />\r
                                </FileConfiguration>\r
                                        />\r
                                </FileConfiguration>\r

+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                               />\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\univ\setup.h"\r
                                >\r
                                <FileConfiguration\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\univ\setup.h"\r
                                >\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r

                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"\r

                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

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

                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"\r

                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

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

                                />\r
                                <FileConfiguration\r
                                />\r
                                <FileConfiguration\r

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

                                />\r
                                <FileConfiguration\r
                                />\r
                                <FileConfiguration\r

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

                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"\r

                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

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

                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"\r

                                        />\r
                                </FileConfiguration>\r
                                        />\r
                                </FileConfiguration>\r

-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                               />\r

                        </File>\r
                </Filter>\r
                <Filter\r
                        </File>\r
                </Filter>\r
                <Filter\r


@@ -3719,6 +5695,10 @@
                                RelativePath="..\..\include\wx\msw\ole\activex.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\msw\ole\activex.h"\r
                                >\r
                        </File>\r

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

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


@@ -3787,6 +5767,10 @@
                                RelativePath="..\..\include\wx\msw\combobox.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\msw\combobox.h"\r
                                >\r
                        </File>\r

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

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


@@ -3799,6 +5783,10 @@
                                RelativePath="..\..\include\wx\msw\cursor.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\msw\cursor.h"\r
                                >\r
                        </File>\r

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

                        <File\r
                                RelativePath="..\..\include\wx\msw\ole\dataform.h"\r
                                >\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\ole\dataform.h"\r
                                >\r


@@ -3812,11 +5800,11 @@
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\datecontrols.h"\r
+                               RelativePath="..\..\include\wx\msw\datectrl.h"\r

                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\datectrl.h"\r
+                               RelativePath="..\..\include\wx\msw\datetimectrl.h"\r

                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r


@@ -3903,47 +5891,36 @@
                                RelativePath="..\..\include\wx\msw\genrcdefs.h"\r
                                >\r
                                <FileConfiguration\r
                                RelativePath="..\..\include\wx\msw\genrcdefs.h"\r
                                >\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Release|Win32"\r
-                                       >\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
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Debug|Win32"\r

                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivud\wx\msw&quot;"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswud\wx\msw&quot;"\r

                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

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

                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswu\wx\msw&quot;"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswu\wx\msw&quot;"\r

                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

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

                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswud\wx\msw&quot;"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivud\wx\msw&quot;"\r

                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r


@@ -3958,36 +5935,47 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

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

                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivud\wx\msw&quot;"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswud\wx\msw&quot;"\r

                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

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

                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswu\wx\msw&quot;"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswu\wx\msw&quot;"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivud\wx\msw&quot;"\r

                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

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

                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswud\wx\msw&quot;"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivu\wx\msw&quot;"\r

                                        />\r
                                </FileConfiguration>\r
                        </File>\r
                                        />\r
                                </FileConfiguration>\r
                        </File>\r


@@ -4015,6 +6003,10 @@
                                RelativePath="..\..\include\wx\msw\htmlhelp.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\msw\htmlhelp.h"\r
                                >\r
                        </File>\r

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

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


@@ -4071,6 +6063,10 @@
                                RelativePath="..\..\include\wx\msw\msvcrt.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\msw\msvcrt.h"\r
                                >\r
                        </File>\r

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

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


@@ -4083,10 +6079,18 @@
                                RelativePath="..\..\include\wx\msw\ole\oleutils.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\msw\ole\oleutils.h"\r
                                >\r
                        </File>\r

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

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

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

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


@@ -4103,6 +6107,10 @@
                                RelativePath="..\..\include\wx\msw\printwin.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\msw\printwin.h"\r
                                >\r
                        </File>\r

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

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


@@ -4119,6 +6127,10 @@
                                RelativePath="..\..\include\wx\msw\region.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\msw\region.h"\r
                                >\r
                        </File>\r

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

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


@@ -4179,6 +6191,10 @@
                                RelativePath="..\..\include\wx\msw\tglbtn.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\msw\tglbtn.h"\r
                                >\r
                        </File>\r

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

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


@@ -4207,6 +6223,14 @@
                                RelativePath="..\..\include\wx\msw\uxthemep.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\msw\uxthemep.h"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\msw\webview_ie.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\webviewhistoryitem_ie.h"\r
+                               >\r
+                       </File>\r

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


@@ -4268,6 +6292,10 @@
                                RelativePath="..\..\include\wx\generic\ctrlsub.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\generic\ctrlsub.h"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\generic\custombgwin.h"\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\generic\dataview.h"\r
                                >\r
                        <File\r
                                RelativePath="..\..\include\wx\generic\dataview.h"\r
                                >\r


@@ -4292,6 +6320,14 @@
                                RelativePath="..\..\include\wx\generic\dragimgg.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\generic\dragimgg.h"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\generic\dvrenderer.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\dvrenderers.h"\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\generic\fdrepdlg.h"\r
                                >\r
                        <File\r
                                RelativePath="..\..\include\wx\generic\fdrepdlg.h"\r
                                >\r


@@ -4344,6 +6380,10 @@
                                RelativePath="..\..\include\wx\generic\hyperlink.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\generic\hyperlink.h"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\generic\infobar.h"\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\generic\laywin.h"\r
                                >\r
                        <File\r
                                RelativePath="..\..\include\wx\generic\laywin.h"\r
                                >\r


@@ -4396,6 +6436,10 @@
                                RelativePath="..\..\include\wx\generic\propdlg.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\generic\propdlg.h"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\generic\richmsgdlgg.h"\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\generic\sashwin.h"\r
                                >\r
                        <File\r
                                RelativePath="..\..\include\wx\generic\sashwin.h"\r
                                >\r


@@ -4436,6 +6480,10 @@
                                RelativePath="..\..\include\wx\generic\textdlgg.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\generic\textdlgg.h"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\generic\timectrl.h"\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\generic\treectlg.h"\r
                                >\r
                        <File\r
                                RelativePath="..\..\include\wx\generic\treectlg.h"\r
                                >\r


@@ -4449,6 +6497,10 @@
                        Name="wxUniv Headers"\r
                        UniqueIdentifier="{46168D7C-2783-50F3-AE9D-A740D5FF0B44}"\r
                        >\r
                        Name="wxUniv Headers"\r
                        UniqueIdentifier="{46168D7C-2783-50F3-AE9D-A740D5FF0B44}"\r
                        >\r

+                       <File\r
+                               RelativePath="..\..\include\wx\univ\anybutton.h"\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\univ\app.h"\r
                                >\r
                        <File\r
                                RelativePath="..\..\include\wx\univ\app.h"\r
                                >\r


@@ -4489,6 +6541,10 @@
                                RelativePath="..\..\include\wx\univ\control.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\univ\control.h"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\univ\custombgwin.h"\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\univ\dialog.h"\r
                                >\r
                        <File\r
                                RelativePath="..\..\include\wx\univ\dialog.h"\r
                                >\r


@@ -4525,6 +6581,10 @@
                                RelativePath="..\..\include\wx\univ\notebook.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\univ\notebook.h"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\univ\panel.h"\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\univ\radiobox.h"\r
                                >\r
                        <File\r
                                RelativePath="..\..\include\wx\univ\radiobox.h"\r
                                >\r


@@ -4670,6 +6730,10 @@
                                RelativePath="..\..\include\wx\html\m_templ.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\html\m_templ.h"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\html\styleparams.h"\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\html\winpars.h"\r
                                >\r
                        <File\r
                                RelativePath="..\..\include\wx\html\winpars.h"\r
                                >\r


@@ -4695,6 +6759,14 @@
                                RelativePath="..\..\include\wx\propgrid\advprops.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\propgrid\advprops.h"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\affinematrix2d.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\affinematrix2dbase.h"\r
+                               >\r
+                       </File>\r

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


@@ -4707,6 +6779,18 @@
                                RelativePath="..\..\include\wx\animdecod.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\animdecod.h"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\anybutton.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\ribbon\art.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\ribbon\art_internal.h"\r
+                               >\r
+                       </File>\r

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


@@ -4723,6 +6807,14 @@
                                RelativePath="..\..\include\wx\aui\auibook.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\aui\auibook.h"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\bannerwindow.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\ribbon\bar.h"\r
+                               >\r
+                       </File>\r

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


@@ -4739,6 +6831,10 @@
                                RelativePath="..\..\include\wx\bookctrl.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\bookctrl.h"\r
                                >\r
                        </File>\r

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

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


@@ -4751,6 +6847,10 @@
                                RelativePath="..\..\include\wx\button.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\button.h"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\ribbon\buttonbar.h"\r
+                               >\r
+                       </File>\r

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


@@ -4811,6 +6911,10 @@
                                RelativePath="..\..\include\wx\colour.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\colour.h"\r
                                >\r
                        </File>\r

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

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


@@ -4819,10 +6923,22 @@
                                RelativePath="..\..\include\wx\combobox.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\combobox.h"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\commandlinkbutton.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\compositewin.h"\r
+                               >\r
+                       </File>\r

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

+                       <File\r
+                               RelativePath="..\..\include\wx\ribbon\control.h"\r
+                               >\r
+                       </File>\r

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


@@ -4835,6 +6951,10 @@
                                RelativePath="..\..\include\wx\cursor.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\cursor.h"\r
                                >\r
                        </File>\r

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

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


@@ -4851,6 +6971,10 @@
                                RelativePath="..\..\include\wx\dateevt.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\dateevt.h"\r
                                >\r
                        </File>\r

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

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


@@ -4939,6 +7063,10 @@
                                RelativePath="..\..\include\wx\dragimag.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\dragimag.h"\r
                                >\r
                        </File>\r

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

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


@@ -4956,7 +7084,7 @@
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\include\wx\evtloop.h"\r
+                               RelativePath="..\..\include\wx\evtloopsrc.h"\r

                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r


@@ -4971,6 +7099,10 @@
                                RelativePath="..\..\include\wx\filedlg.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\filedlg.h"\r
                                >\r
                        </File>\r

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

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


@@ -4987,6 +7119,10 @@
                                RelativePath="..\..\include\wx\font.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\font.h"\r
                                >\r
                        </File>\r

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

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


@@ -5011,6 +7147,10 @@
                                RelativePath="..\..\include\wx\aui\framemanager.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\aui\framemanager.h"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\ribbon\gallery.h"\r
+                               >\r
+                       </File>\r

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


@@ -5135,6 +7275,14 @@
                                RelativePath="..\..\include\wx\imagxpm.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\imagxpm.h"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\infobar.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\itemid.h"\r
+                               >\r
+                       </File>\r

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


@@ -5195,6 +7343,10 @@
                                RelativePath="..\..\include\wx\minifram.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\minifram.h"\r
                                >\r
                        </File>\r

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

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


@@ -5231,6 +7383,10 @@
                                RelativePath="..\..\include\wx\ownerdrw.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\ownerdrw.h"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\ribbon\page.h"\r
+                               >\r
+                       </File>\r

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


@@ -5239,6 +7395,10 @@
                                RelativePath="..\..\include\wx\panel.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\panel.h"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\ribbon\panel.h"\r
+                               >\r
+                       </File>\r

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


@@ -5247,6 +7407,10 @@
                                RelativePath="..\..\include\wx\pen.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\pen.h"\r
                                >\r
                        </File>\r

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

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


@@ -5315,6 +7479,10 @@
                                RelativePath="..\..\include\wx\radiobut.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\radiobut.h"\r
                                >\r
                        </File>\r

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

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


@@ -5331,14 +7499,38 @@
                                RelativePath="..\..\include\wx\renderer.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\renderer.h"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\richmsgdlg.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextbackgroundpage.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextborderspage.h"\r
+                               >\r
+                       </File>\r

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

+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextbulletspage.h"\r
+                               >\r
+                       </File>\r

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

+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextdialogpage.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextfontpage.h"\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\richtext\richtextformatdlg.h"\r
                                >\r
                        <File\r
                                RelativePath="..\..\include\wx\richtext\richtextformatdlg.h"\r
                                >\r


@@ -5347,14 +7539,38 @@
                                RelativePath="..\..\include\wx\richtext\richtexthtml.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\richtext\richtexthtml.h"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextimagedlg.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextindentspage.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextliststylepage.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextmarginspage.h"\r
+                               >\r
+                       </File>\r

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

+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextsizepage.h"\r
+                               >\r
+                       </File>\r

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

+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextstylepage.h"\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\richtext\richtextstyles.h"\r
                                >\r
                        <File\r
                                RelativePath="..\..\include\wx\richtext\richtextstyles.h"\r
                                >\r


@@ -5363,10 +7579,18 @@
                                RelativePath="..\..\include\wx\richtext\richtextsymboldlg.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\richtext\richtextsymboldlg.h"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextuicustomization.h"\r
+                               >\r
+                       </File>\r

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

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

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


@@ -5415,6 +7639,10 @@
                                RelativePath="..\..\include\wx\splash.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\splash.h"\r
                                >\r
                        </File>\r

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

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


@@ -5459,6 +7687,10 @@
                                RelativePath="..\..\include\wx\tbarbase.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\tbarbase.h"\r
                                >\r
                        </File>\r

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

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


@@ -5471,10 +7703,18 @@
                                RelativePath="..\..\include\wx\textentry.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\textentry.h"\r
                                >\r
                        </File>\r

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

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

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

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


@@ -5483,6 +7723,10 @@
                                RelativePath="..\..\include\wx\tipwin.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\tipwin.h"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\ribbon\toolbar.h"\r
+                               >\r
+                       </File>\r

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


@@ -5495,6 +7739,10 @@
                                RelativePath="..\..\include\wx\tooltip.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\tooltip.h"\r
                                >\r
                        </File>\r

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

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


@@ -5503,6 +7751,10 @@
                                RelativePath="..\..\include\wx\treebase.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\treebase.h"\r
                                >\r
                        </File>\r

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

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


@@ -5511,6 +7763,14 @@
                                RelativePath="..\..\include\wx\treectrl.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\treectrl.h"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\treelist.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\uiaction.h"\r
+                               >\r
+                       </File>\r

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


@@ -5519,6 +7779,10 @@
                                RelativePath="..\..\include\wx\validate.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\validate.h"\r
                                >\r
                        </File>\r

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

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


@@ -5539,6 +7803,18 @@
                                RelativePath="..\..\include\wx\vscroll.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\vscroll.h"\r
                                >\r
                        </File>\r

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

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


@@ -5547,6 +7823,10 @@
                                RelativePath="..\..\include\wx\windowid.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\windowid.h"\r
                                >\r
                        </File>\r

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

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


@@ -5571,6 +7851,10 @@
                                RelativePath="..\..\include\wx\xrc\xh_animatctrl.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\xrc\xh_animatctrl.h"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_bannerwindow.h"\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_bmp.h"\r
                                >\r
                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_bmp.h"\r
                                >\r


@@ -5611,6 +7895,10 @@
                                RelativePath="..\..\include\wx\xrc\xh_clrpicker.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\xrc\xh_clrpicker.h"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_cmdlinkbn.h"\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_collpane.h"\r
                                >\r
                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_collpane.h"\r
                                >\r


@@ -5619,6 +7907,10 @@
                                RelativePath="..\..\include\wx\xrc\xh_combo.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\xrc\xh_combo.h"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_comboctrl.h"\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_datectrl.h"\r
                                >\r
                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_datectrl.h"\r
                                >\r


@@ -5631,6 +7923,14 @@
                                RelativePath="..\..\include\wx\xrc\xh_dlg.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\xrc\xh_dlg.h"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_editlbox.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_filectrl.h"\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_filepicker.h"\r
                                >\r
                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_filepicker.h"\r
                                >\r


@@ -5767,10 +8067,18 @@
                                RelativePath="..\..\include\wx\xrc\xh_tglbtn.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\xrc\xh_tglbtn.h"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_timectrl.h"\r
+                               >\r
+                       </File>\r

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

+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_toolbk.h"\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_tree.h"\r
                                >\r
                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_tree.h"\r
                                >\r