Richtext interface fixes and additions for Phoenix

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

diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj
index a653721643dd1cd921705e0c974f64d7257380c8..b81afc8128337e19ccc796099e884e7dfd603ccc 100644 (file)
--- a/build/msw/wx_vc8_core.vcproj
+++ b/build/msw/wx_vc8_core.vcproj
@@ -44,14 +44,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r

-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r

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

-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r

                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r


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

-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\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
                                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


@@ -129,14 +129,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r

-                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r

                                AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\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="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r

-                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0"\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
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r


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

-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_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;wxUSE_BASE=0"\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
                        />\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
                        />\r


@@ -188,173 +188,6 @@
                                Name="VCPostBuildEventTool"\r
                        />\r
                </Configuration>\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                </Configuration>\r

-               <Configuration\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
-                       >\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;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
-                               RuntimeTypeInfo="true"\r
-                               UsePrecompiledHeader="2"\r
-                               PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivud\wxprec_corelib.pch"\r
-                               ObjectFile="vc_mswunivud\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_core.pdb"\r
-                               WarningLevel="4"\r
-                               SuppressStartupBanner="true"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\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
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_core.lib"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc8_core.bsc"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="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
-                       >\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;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
-                               ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
-                               RuntimeTypeInfo="true"\r
-                               UsePrecompiledHeader="2"\r
-                               PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivu\wxprec_corelib.pch"\r
-                               ObjectFile="vc_mswunivu\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_core.pdb"\r
-                               WarningLevel="4"\r
-                               SuppressStartupBanner="true"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0"\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
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmswuniv29u_core.lib"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc8_core.bsc"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r

                <Configuration\r
                        Name="DLL Debug|Win32"\r
                        OutputDirectory="..\..\lib\vc_dll"\r
                <Configuration\r
                        Name="DLL Debug|Win32"\r
                        OutputDirectory="..\..\lib\vc_dll"\r


@@ -378,14 +211,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r

-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_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

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

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

                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r


@@ -396,7 +229,7 @@
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_coredll.pch"\r
                                ObjectFile="vc_mswuddll\core\"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_coredll.pch"\r
                                ObjectFile="vc_mswuddll\core\"\r

-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_core_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw295ud_core_vc_custom.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r


@@ -407,7 +240,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_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=wxmsw295ud_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


@@ -417,15 +250,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 wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293ud_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\wxmsw295ud_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\wxmsw293ud_core_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw295ud_core_vc_custom.pdb"\r

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


@@ -472,14 +305,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r

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

                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\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="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r

-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\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
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r


@@ -487,7 +320,7 @@
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_coredll.pch"\r
                                ObjectFile="vc_mswudll\core\"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_coredll.pch"\r
                                ObjectFile="vc_mswudll\core\"\r

-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_core_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw295u_core_vc_custom.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r


@@ -498,7 +331,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_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;WXDLLNAME=wxmsw295u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\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
                        />\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
                        />\r


@@ -508,15 +341,15 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\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 wininet.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293u_core_vc_custom.dll"\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\wxmsw295u_core_vc_custom.dll"\r

                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_core.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_core.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r

-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_core_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw295u_core_vc_custom.pdb"\r

                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r


@@ -542,201 +375,14 @@
                                Name="VCPostBuildEventTool"\r
                        />\r
                </Configuration>\r
                                Name="VCPostBuildEventTool"\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
-                       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;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
-                               RuntimeTypeInfo="true"\r
-                               UsePrecompiledHeader="2"\r
-                               PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivuddll\wxprec_coredll.pch"\r
-                               ObjectFile="vc_mswunivuddll\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_core_vc_custom.pdb"\r
-                               WarningLevel="4"\r
-                               SuppressStartupBanner="true"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\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
-                       />\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 wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_core_vc_custom.dll"\r
-                               LinkIncremental="2"\r
-                               ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_core.lib"\r
-                               SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateManifest="true"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_core_vc_custom.pdb"\r
-                               TargetMachine="1"\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_dll\wx_vc8_core.bsc"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="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
-                       >\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;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__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
-                               PrecompiledHeaderFile="vc_mswunivudll\wxprec_coredll.pch"\r
-                               ObjectFile="vc_mswunivudll\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_core_vc_custom.pdb"\r
-                               WarningLevel="4"\r
-                               SuppressStartupBanner="true"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\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
-                       />\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 wininet.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293u_core_vc_custom.dll"\r
-                               LinkIncremental="1"\r
-                               ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_core.lib"\r
-                               SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateManifest="true"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_core_vc_custom.pdb"\r
-                               TargetMachine="1"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\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_dll\wx_vc8_core.bsc"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-       </Configurations>\r
-       <References>\r
-               \r
-       </References>\r
-       <Files>\r
-               <Filter\r
-                       Name="Common Sources"\r
-                       UniqueIdentifier="{A6A5C30D-BDB6-5050-906D-10A96065136C}"\r
+       </Configurations>\r
+       <References>\r
+               \r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Common Sources"\r
+                       UniqueIdentifier="{A6A5C30D-BDB6-5050-906D-10A96065136C}"\r

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


@@ -913,22 +559,6 @@
                                                UsePrecompiledHeader="1"\r
                                        />\r
                                </FileConfiguration>\r
                                                UsePrecompiledHeader="1"\r
                                        />\r
                                </FileConfiguration>\r

-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="1"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="1"\r
-                                       />\r
-                               </FileConfiguration>\r

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


@@ -945,22 +575,6 @@
                                                UsePrecompiledHeader="1"\r
                                        />\r
                                </FileConfiguration>\r
                                                UsePrecompiledHeader="1"\r
                                        />\r
                                </FileConfiguration>\r

-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="1"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="1"\r
-                                       />\r
-                               </FileConfiguration>\r

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


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

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

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


@@ -1270,6 +888,10 @@
                                RelativePath="..\..\src\common\textentrycmn.cpp"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\src\common\textentrycmn.cpp"\r
                                >\r
                        </File>\r

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

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


@@ -1326,74 +948,10 @@
                        <File\r
                                RelativePath="..\..\src\msw\accel.cpp"\r
                                >\r
                        <File\r
                                RelativePath="..\..\src\msw\accel.cpp"\r
                                >\r

-                               <FileConfiguration\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
-                                       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_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
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\ole\access.cpp"\r
                                >\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\ole\access.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\ole\activex.cpp"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\ole\activex.cpp"\r


@@ -1402,22 +960,6 @@
                        <File\r
                                RelativePath="..\..\src\msw\anybutton.cpp"\r
                                >\r
                        <File\r
                                RelativePath="..\..\src\msw\anybutton.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\app.cpp"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\app.cpp"\r


@@ -1426,22 +968,6 @@
                        <File\r
                                RelativePath="..\..\src\msw\artmsw.cpp"\r
                                >\r
                        <File\r
                                RelativePath="..\..\src\msw\artmsw.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\ole\automtn.cpp"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\ole\automtn.cpp"\r


@@ -1454,54 +980,6 @@
                        <File\r
                                RelativePath="..\..\src\msw\bmpbuttn.cpp"\r
                                >\r
                        <File\r
                                RelativePath="..\..\src\msw\bmpbuttn.cpp"\r
                                >\r

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

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


@@ -1510,54 +988,6 @@
                        <File\r
                                RelativePath="..\..\src\msw\button.cpp"\r
                                >\r
                        <File\r
                                RelativePath="..\..\src\msw\button.cpp"\r
                                >\r

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

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


@@ -1566,158 +996,14 @@
                        <File\r
                                RelativePath="..\..\src\msw\checkbox.cpp"\r
                                >\r
                        <File\r
                                RelativePath="..\..\src\msw\checkbox.cpp"\r
                                >\r

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

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

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

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

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

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


@@ -1726,22 +1012,6 @@
                        <File\r
                                RelativePath="..\..\src\msw\colordlg.cpp"\r
                                >\r
                        <File\r
                                RelativePath="..\..\src\msw\colordlg.cpp"\r
                                >\r

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

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


@@ -1750,126 +1020,14 @@
                        <File\r
                                RelativePath="..\..\src\msw\combo.cpp"\r
                                >\r
                        <File\r
                                RelativePath="..\..\src\msw\combo.cpp"\r
                                >\r

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

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

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

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

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

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


@@ -1906,54 +1064,6 @@
                        <File\r
                                RelativePath="..\..\src\msw\dialog.cpp"\r
                                >\r
                        <File\r
                                RelativePath="..\..\src\msw\dialog.cpp"\r
                                >\r

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

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


@@ -1966,22 +1076,6 @@
                        <File\r
                                RelativePath="..\..\src\msw\dirdlg.cpp"\r
                                >\r
                        <File\r
                                RelativePath="..\..\src\msw\dirdlg.cpp"\r
                                >\r

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

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


@@ -1990,22 +1084,6 @@
                        <File\r
                                RelativePath="..\..\src\msw\dragimag.cpp"\r
                                >\r
                        <File\r
                                RelativePath="..\..\src\msw\dragimag.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\ole\dropsrc.cpp"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\ole\dropsrc.cpp"\r


@@ -2026,74 +1104,10 @@
                        <File\r
                                RelativePath="..\..\src\msw\fdrepdlg.cpp"\r
                                >\r
                        <File\r
                                RelativePath="..\..\src\msw\fdrepdlg.cpp"\r
                                >\r

-                               <FileConfiguration\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
-                                       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_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
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\filedlg.cpp"\r
                                >\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\filedlg.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\font.cpp"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\font.cpp"\r


@@ -2102,22 +1116,6 @@
                        <File\r
                                RelativePath="..\..\src\msw\fontdlg.cpp"\r
                                >\r
                        <File\r
                                RelativePath="..\..\src\msw\fontdlg.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\fontenum.cpp"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\fontenum.cpp"\r


@@ -2130,74 +1128,10 @@
                        <File\r
                                RelativePath="..\..\src\msw\frame.cpp"\r
                                >\r
                        <File\r
                                RelativePath="..\..\src\msw\frame.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\gauge.cpp"\r
                                >\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\gauge.cpp"\r
                                >\r

-                               <FileConfiguration\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
-                                       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_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
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r

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


@@ -2218,22 +1152,6 @@
                        <File\r
                                RelativePath="..\..\src\msw\headerctrl.cpp"\r
                                >\r
                        <File\r
                                RelativePath="..\..\src\msw\headerctrl.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\helpchm.cpp"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\helpchm.cpp"\r


@@ -2254,126 +1172,14 @@
                        <File\r
                                RelativePath="..\..\src\msw\iniconf.cpp"\r
                                >\r
                        <File\r
                                RelativePath="..\..\src\msw\iniconf.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\listbox.cpp"\r
                                >\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\listbox.cpp"\r
                                >\r

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

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


@@ -2382,114 +1188,18 @@
                        <File\r
                                RelativePath="..\..\src\msw\mdi.cpp"\r
                                >\r
                        <File\r
                                RelativePath="..\..\src\msw\mdi.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\menu.cpp"\r
                                >\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\menu.cpp"\r
                                >\r

-                               <FileConfiguration\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
-                                       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_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
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\menuitem.cpp"\r
                                >\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\menuitem.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\metafile.cpp"\r
                                >\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\metafile.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\minifram.cpp"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\minifram.cpp"\r


@@ -2498,22 +1208,6 @@
                        <File\r
                                RelativePath="..\..\src\msw\msgdlg.cpp"\r
                                >\r
                        <File\r
                                RelativePath="..\..\src\msw\msgdlg.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\mslu.cpp"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\mslu.cpp"\r


@@ -2522,98 +1216,18 @@
                        <File\r
                                RelativePath="..\..\src\msw\nativdlg.cpp"\r
                                >\r
                        <File\r
                                RelativePath="..\..\src\msw\nativdlg.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\nativewin.cpp"\r
                                >\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\nativewin.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
-                                       Name="DLL Universal Release|Win32"
-                                       ExcludedFromBuild="true"
-                               />
-                       </File>
-                       <File
-                               RelativePath="..\..\src\msw\nonownedwnd.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\src\msw\notebook.cpp"
-                               >
-                               <FileConfiguration
-                                       Name="Debug|Win32"
-                                       >
-                                       <Tool
-                                               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
-                                       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_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
-                                       Name="DLL Universal Release|Win32"\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

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


@@ -2622,22 +1236,6 @@
                        <File\r
                                RelativePath="..\..\src\msw\ownerdrw.cpp"\r
                                >\r
                        <File\r
                                RelativePath="..\..\src\msw\ownerdrw.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\palette.cpp"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\palette.cpp"\r


@@ -2646,22 +1244,6 @@
                        <File\r
                                RelativePath="..\..\src\msw\panel.cpp"\r
                                >\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
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\pen.cpp"\r


@@ -2682,126 +1264,14 @@
                        <File\r
                                RelativePath="..\..\src\msw\progdlg.cpp"\r
                                >\r
                        <File\r
                                RelativePath="..\..\src\msw\progdlg.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\radiobox.cpp"\r
                                >\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\radiobox.cpp"\r
                                >\r

-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswud\core\msw_radiobox.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswu\core\msw_radiobox.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       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_radiobox.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswudll\core\msw_radiobox.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r

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

-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswud\core\msw_radiobut.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswu\core\msw_radiobut.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       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_radiobut.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswudll\core\msw_radiobut.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r

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


@@ -2814,74 +1284,14 @@
                        <File\r
                                RelativePath="..\..\src\msw\richmsgdlg.cpp"\r
                                >\r
                        <File\r
                                RelativePath="..\..\src\msw\richmsgdlg.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\ole\safearray.cpp"\r
+                               >\r

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

-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswud\core\msw_scrolbar.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswu\core\msw_scrolbar.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       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_scrolbar.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswudll\core\msw_scrolbar.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r

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


@@ -2890,2680 +1300,279 @@
                        <File\r
                                RelativePath="..\..\src\msw\slider.cpp"\r
                                >\r
                        <File\r
                                RelativePath="..\..\src\msw\slider.cpp"\r
                                >\r

-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswud\core\msw_slider.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswu\core\msw_slider.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       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_slider.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswudll\core\msw_slider.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r

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

-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswud\core\msw_spinbutt.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswu\core\msw_spinbutt.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       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_spinbutt.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\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
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\spinctrl.cpp"\r
                                >\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\spinctrl.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\statbmp.cpp"\r
                                >\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\statbmp.cpp"\r
                                >\r

+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\statbox.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\statline.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\stattext.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\statusbar.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\textctrl.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\textentry.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\textmeasure.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\tglbtn.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\toolbar.cpp"\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
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\uiaction.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\utilsgui.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\utilswin.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="Debug|Win32"\r
                                <FileConfiguration\r
                                        Name="Debug|Win32"\r

-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswud\core\msw_statbmp.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswu\core\msw_statbmp.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       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_statbmp.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswudll\core\msw_statbmp.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r

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

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

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

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

                                >\r
                                >\r

-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswud\core\msw_statbox.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswu\core\msw_statbox.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       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_statbox.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswudll\core\msw_statbox.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r

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

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

                                >\r
                                >\r

-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswud\core\msw_statline.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswu\core\msw_statline.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       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_statline.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswudll\core\msw_statline.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r

                        </File>\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\msw\stattext.cpp"\r
+                               RelativePath="..\..\src\generic\busyinfo.cpp"\r

                                >\r
                                >\r

-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswud\core\msw_stattext.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswu\core\msw_stattext.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       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_stattext.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswudll\core\msw_stattext.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r

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

-                               RelativePath="..\..\src\msw\statusbar.cpp"\r
+                               RelativePath="..\..\src\generic\buttonbar.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\msw\textctrl.cpp"\r
+                               RelativePath="..\..\src\generic\choicbkg.cpp"\r

                                >\r
                                >\r

-                               <FileConfiguration\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
-                                       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_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
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r

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

-                               RelativePath="..\..\src\msw\textentry.cpp"\r
+                               RelativePath="..\..\src\generic\choicdgg.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\msw\tglbtn.cpp"\r
+                               RelativePath="..\..\src\generic\clrpickerg.cpp"\r

                                >\r
                                >\r

-                               <FileConfiguration\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
-                                       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_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
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r

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

-                               RelativePath="..\..\src\msw\toolbar.cpp"\r
-                               >\r
-                               <FileConfiguration\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
-                                       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_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
-                                       Name="DLL Universal Release|Win32"\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
+                               RelativePath="..\..\src\generic\collpaneg.cpp"\r

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

-                               RelativePath="..\..\src\msw\treectrl.cpp"\r
+                               RelativePath="..\..\src\generic\combog.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\msw\uiaction.cpp"\r
+                               RelativePath="..\..\src\generic\dcpsg.cpp"\r

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

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

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

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

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

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

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

-                               RelativePath="..\..\src\msw\version.rc"\r
+                               RelativePath="..\..\src\generic\filepickerg.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
-                                       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\msw\volume.cpp"\r
+                               RelativePath="..\..\src\generic\fontpickerg.cpp"\r

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

-                               RelativePath="..\..\src\msw\window.cpp"\r
+                               RelativePath="..\..\src\generic\graphicc.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\accel.cpp"\r
+                               RelativePath="..\..\src\generic\headerctrlg.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\generic_accel.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswunivu\core\generic_accel.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       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_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\busyinfo.cpp"\r
+                               RelativePath="..\..\src\generic\infobar.cpp"\r

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

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

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

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

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

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

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

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

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

-                               RelativePath="..\..\src\generic\collpaneg.cpp"\r
+                               RelativePath="..\..\src\generic\numdlgg.cpp"\r

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

-                               RelativePath="..\..\src\generic\colrdlgg.cpp"\r
+                               RelativePath="..\..\src\generic\preferencesg.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

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

-                               RelativePath="..\..\src\generic\combog.cpp"\r
+                               RelativePath="..\..\src\generic\printps.cpp"\r

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

-                               RelativePath="..\..\src\generic\dcpsg.cpp"\r
+                               RelativePath="..\..\src\generic\prntdlgg.cpp"\r

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

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

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

-                               RelativePath="..\..\src\generic\dirdlgg.cpp"\r
+                               RelativePath="..\..\src\generic\renderg.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

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

-                               RelativePath="..\..\src\generic\dragimgg.cpp"\r
+                               RelativePath="..\..\src\generic\richmsgdlgg.cpp"\r

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

-                               RelativePath="..\..\src\generic\fdrepdlg.cpp"\r
+                               RelativePath="..\..\src\generic\scrlwing.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\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
                        </File>\r
                        <File\r

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

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

-                               RelativePath="..\..\src\generic\filedlgg.cpp"\r
+                               RelativePath="..\..\src\generic\spinctlg.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

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

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

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

-                               RelativePath="..\..\src\generic\fontdlgg.cpp"\r
+                               RelativePath="..\..\src\generic\srchctlg.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

                        </File>\r
                        <File\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
+                               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\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
-                               <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
-                               RelativePath="..\..\src\univ\combobox.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_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
-                               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
-                               <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\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
-                                       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_gauge.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswunivudll\core\univ_gauge.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\themes\gtk.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       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\inpcons.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\inphand.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\listbox.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_listbox.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswunivu\core\univ_listbox.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       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_listbox.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswunivudll\core\univ_listbox.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\menu.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       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_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
-                                       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_menu.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswunivudll\core\univ_menu.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\themes\metal.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       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\themes\mono.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\notebook.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_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
-                                       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_notebook.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswunivudll\core\univ_notebook.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\radiobox.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       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_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
-                                       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_radiobox.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswunivudll\core\univ_radiobox.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\radiobut.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       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_radiobut.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswunivu\core\univ_radiobut.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       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_radiobut.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswunivudll\core\univ_radiobut.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\scrarrow.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       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\scrolbar.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_scrolbar.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswunivu\core\univ_scrolbar.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       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_scrolbar.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswunivudll\core\univ_scrolbar.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\scrthumb.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       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\settingsuniv.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\slider.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_slider.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswunivu\core\univ_slider.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       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_slider.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswunivudll\core\univ_slider.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\spinbutt.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       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_spinbutt.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswunivu\core\univ_spinbutt.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       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_spinbutt.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswunivudll\core\univ_spinbutt.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\statbmp.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       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_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
-                                       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_statbmp.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswunivudll\core\univ_statbmp.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\statbox.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       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_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
-                                       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_statbox.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswunivudll\core\univ_statbox.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\statline.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       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_statline.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswunivu\core\univ_statline.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       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_statline.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswunivudll\core\univ_statline.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\stattext.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       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_stattext.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswunivu\core\univ_stattext.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       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_stattext.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswunivudll\core\univ_stattext.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\statusbr.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       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_statusbr.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswunivu\core\univ_statusbr.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       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_statusbr.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswunivudll\core\univ_statusbr.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\stdrend.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       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\textctrl.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_textctrl.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswunivu\core\univ_textctrl.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       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_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
+                               >\r

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

-                               RelativePath="..\..\src\univ\tglbtn.cpp"\r
+                               RelativePath="..\..\src\generic\statusbr.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_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
-                                       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_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\theme.cpp"\r
+                               RelativePath="..\..\src\generic\textdlgg.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

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

-                               RelativePath="..\..\src\univ\toolbar.cpp"\r
+                               RelativePath="..\..\src\generic\tipwin.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_toolbar.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="vc_mswunivu\core\univ_toolbar.obj"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       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_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
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\univ\topluniv.cpp"\r
+                               RelativePath="..\..\src\generic\toolbkg.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

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

-                               RelativePath="..\..\src\univ\themes\win32.cpp"\r
+                               RelativePath="..\..\src\generic\treebkg.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

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

-                               RelativePath="..\..\src\univ\winuniv.cpp"\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
                                >\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
                </Filter>\r
                <Filter\r
                        </File>\r
                </Filter>\r
                <Filter\r


@@ -5593,12 +1602,6 @@
                                                Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"\r
                                        />\r
                                </FileConfiguration>\r
                                                Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"\r
                                        />\r
                                </FileConfiguration>\r

-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                               />\r

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


@@ -5619,12 +1622,6 @@
                                                Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"\r
                                        />\r
                                </FileConfiguration>\r
                                                Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"\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
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\univ\setup.h"\r


@@ -5635,52 +1632,12 @@
                                <FileConfiguration\r
                                        Name="Release|Win32"\r
                                />\r
                                <FileConfiguration\r
                                        Name="Release|Win32"\r
                                />\r

-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\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
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\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
-                                       />\r
-                               </FileConfiguration>\r

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

-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\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
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\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
-                                       />\r
-                               </FileConfiguration>\r

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


@@ -5782,42 +1739,42 @@
                        <File\r
                                RelativePath="..\..\include\wx\msw\ctrlsub.h"\r
                                >\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\ctrlsub.h"\r
                                >\r

-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\msw\cursor.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\msw\custombgwin.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\msw\ole\dataform.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\msw\ole\dataobj.h"
-                               >
+                       </File>\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
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\ole\dataobj.h"\r
+                               >\r

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

-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\msw\datectrl.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\msw\datetimectrl.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\msw\dc.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\msw\dcclient.h"
-                               >
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\datectrl.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\datetimectrl.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\dc.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\dcclient.h"\r
+                               >\r

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


@@ -5916,28 +1873,6 @@
                                                AdditionalDependencies="&quot;..\..\lib\vc_lib\mswu\wx\msw&quot;"\r
                                        />\r
                                </FileConfiguration>\r
                                                AdditionalDependencies="&quot;..\..\lib\vc_lib\mswu\wx\msw&quot;"\r
                                        />\r
                                </FileConfiguration>\r

-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\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
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivu\wx\msw&quot;"\r
-                                       />\r
-                               </FileConfiguration>\r

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


@@ -5960,28 +1895,6 @@
                                                AdditionalDependencies="&quot;..\..\lib\vc_dll\mswu\wx\msw&quot;"\r
                                        />\r
                                </FileConfiguration>\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
-                                       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

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


@@ -6023,6 +1936,10 @@
                                RelativePath="..\..\include\wx\msw\iniconf.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\msw\iniconf.h"\r
                                >\r
                        </File>\r

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

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


@@ -6056,28 +1973,28 @@
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\missing.h"\r
+                               RelativePath="..\..\include\wx\msw\missing.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\msgdlg.h"\r
+                               >\r
+                       </File>\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
                        <File\r
                                >\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\msgdlg.h"\r
+                               RelativePath="..\..\include\wx\msw\notifmsg.h"\r

                                >\r
                                >\r

-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\msw\msvcrt.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\msw\nonownedwnd.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\msw\notebook.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\msw\notifmsg.h"
-                               >

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


@@ -6136,11 +2053,11 @@
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\scrolbar.h"\r
+                               RelativePath="..\..\include\wx\msw\ole\safearray.h"\r

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

-                               RelativePath="..\..\include\wx\msw\setup0.h"\r
+                               RelativePath="..\..\include\wx\msw\scrolbar.h"\r

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


@@ -6190,22 +2107,22 @@
                        <File\r
                                RelativePath="..\..\include\wx\msw\textentry.h"\r
                                >\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\textentry.h"\r
                                >\r

-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\msw\tglbtn.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\msw\timectrl.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\msw\toolbar.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\msw\tooltip.h"
-                               >
+                       </File>\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
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\tooltip.h"\r
+                               >\r

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


@@ -6228,14 +2145,18 @@
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\webview_ie.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\msw\webviewhistoryitem_ie.h"
-                               >
-                       </File>
-                       <File
+                               RelativePath="..\..\include\wx\msw\webview_ie.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\webview_missing.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
                        </File>\r


@@ -6291,67 +2212,47 @@
                        <File\r
                                RelativePath="..\..\include\wx\generic\combo.h"\r
                                >\r
                        <File\r
                                RelativePath="..\..\include\wx\generic\combo.h"\r
                                >\r

-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\generic\ctrlsub.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\generic\custombgwin.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\generic\dataview.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\generic\datectrl.h"
-                               >

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

-                               RelativePath="..\..\include\wx\generic\dcpsg.h"\r
+                               RelativePath="..\..\include\wx\generic\custombgwin.h"\r

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

-                               RelativePath="..\..\include\wx\generic\dirctrlg.h"\r
+                               RelativePath="..\..\include\wx\generic\dataview.h"\r

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

-                               RelativePath="..\..\include\wx\generic\dirdlgg.h"\r
+                               RelativePath="..\..\include\wx\generic\datectrl.h"\r

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

-                               RelativePath="..\..\include\wx\generic\dragimgg.h"\r
+                               RelativePath="..\..\include\wx\generic\dcpsg.h"\r

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

-                               RelativePath="..\..\include\wx\generic\dvrenderer.h"\r
+                               RelativePath="..\..\include\wx\generic\dirctrlg.h"\r

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

-                               RelativePath="..\..\include\wx\generic\dvrenderers.h"\r
+                               RelativePath="..\..\include\wx\generic\dragimgg.h"\r

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

-                               RelativePath="..\..\include\wx\generic\fdrepdlg.h"\r
+                               RelativePath="..\..\include\wx\generic\dvrenderer.h"\r

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

-                               RelativePath="..\..\include\wx\generic\filectrlg.h"\r
+                               RelativePath="..\..\include\wx\generic\dvrenderers.h"\r

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

-                               RelativePath="..\..\include\wx\generic\filedlgg.h"\r
+                               RelativePath="..\..\include\wx\generic\filectrlg.h"\r

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

-                       <File\r
-                               RelativePath="..\..\include\wx\generic\fontdlgg.h"\r
-                               >\r
-                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\generic\fontpickerg.h"\r
                                >\r
                        <File\r
                                RelativePath="..\..\include\wx\generic\fontpickerg.h"\r
                                >\r


@@ -6392,18 +2293,10 @@
                                RelativePath="..\..\include\wx\generic\laywin.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\generic\laywin.h"\r
                                >\r
                        </File>\r

-                       <File\r
-                               RelativePath="..\..\include\wx\generic\listctrl.h"\r
-                               >\r
-                       </File>\r

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

-                       <File\r
-                               RelativePath="..\..\include\wx\generic\mdig.h"\r
-                               >\r
-                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\generic\msgdlgg.h"\r
                                >\r
                        <File\r
                                RelativePath="..\..\include\wx\generic\msgdlgg.h"\r
                                >\r


@@ -6477,200 +2370,19 @@
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\statusbr.h"\r
-                               >\r
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\generic\textdlgg.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\generic\timectrl.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\generic\treectlg.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\generic\wizard.h"
-                               >
-                       </File>\r
-               </Filter>\r
-               <Filter\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
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\bmpbuttn.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\button.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\checkbox.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\checklst.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\chkconf.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\choice.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\colschem.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\combobox.h"\r
-                               >\r
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\univ\control.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\univ\custombgwin.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\univ\dialog.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\univ\frame.h"
-                               >
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\gauge.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\inpcons.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\inphand.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\listbox.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\menu.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\menuitem.h"\r
-                               >\r
-                       </File>\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
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\radiobut.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\renderer.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\scrarrow.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\scrolbar.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\scrthumb.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\scrtimer.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\slider.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\spinbutt.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\statbmp.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\statbox.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\statline.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\stattext.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\statusbr.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\stdrend.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\textctrl.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\tglbtn.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\theme.h"\r
+                               RelativePath="..\..\include\wx\generic\textdlgg.h"\r

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

-                               RelativePath="..\..\include\wx\univ\toolbar.h"\r
+                               RelativePath="..\..\include\wx\generic\timectrl.h"\r

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

-                               RelativePath="..\..\include\wx\univ\toplevel.h"\r
+                               RelativePath="..\..\include\wx\generic\treectlg.h"\r

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

-                               RelativePath="..\..\include\wx\univ\window.h"\r
+                               RelativePath="..\..\include\wx\generic\wizard.h"\r

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


@@ -6855,10 +2567,6 @@
                                RelativePath="..\..\include\wx\ribbon\buttonbar.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\ribbon\buttonbar.h"\r
                                >\r
                        </File>\r

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

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


@@ -6950,42 +2658,42 @@
                        <File\r
                                RelativePath="..\..\include\wx\ctrlsub.h"\r
                                >\r
                        <File\r
                                RelativePath="..\..\include\wx\ctrlsub.h"\r
                                >\r

-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\cursor.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\custombgwin.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\dataobj.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\dataview.h"
-                               >
+                       </File>\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
+                       <File\r
+                               RelativePath="..\..\include\wx\dataview.h"\r
+                               >\r

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

-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\dateevt.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\datetimectrl.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\dc.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\dcbuffer.h"
-                               >
+                       </File>\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
+                       <File\r
+                               RelativePath="..\..\include\wx\dcbuffer.h"\r
+                               >\r

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


@@ -7583,25 +3291,29 @@
                                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\richtexttabspage.h"\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\richtext\richtextuicustomization.h"\r
                                >\r
                        <File\r
                                RelativePath="..\..\include\wx\richtext\richtextuicustomization.h"\r
                                >\r

-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\richtext\richtextxml.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\richtooltip.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\sashwin.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\scopeguard.h"
-                               >
+                       </File>\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
+                       <File\r
+                               RelativePath="..\..\include\wx\scopeguard.h"\r
+                               >\r

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


@@ -7619,6 +3331,10 @@
                                RelativePath="..\..\include\wx\settings.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\settings.h"\r
                                >\r
                        </File>\r

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

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


@@ -7679,6 +3395,10 @@
                                RelativePath="..\..\include\wx\stc\stc.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\stc\stc.h"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\aui\tabart.h"\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\aui\tabmdi.h"\r
                                >\r
                        <File\r
                                RelativePath="..\..\include\wx\aui\tabmdi.h"\r
                                >\r


@@ -7710,22 +3430,22 @@
                        <File\r
                                RelativePath="..\..\include\wx\textwrapper.h"\r
                                >\r
                        <File\r
                                RelativePath="..\..\include\wx\textwrapper.h"\r
                                >\r

-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\tglbtn.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\timectrl.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\tipdlg.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\tipwin.h"
-                               >
+                       </File>\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
+                       <File\r
+                               RelativePath="..\..\include\wx\tipwin.h"\r
+                               >\r

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


@@ -7808,14 +3528,18 @@
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\include\wx\webview.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\webviewarchivehandler.h"
-                               >
-                       </File>
-                       <File
+                               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\webviewfshandler.h"\r
+                               >\r
+                       </File>\r
+                       <File\r

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


@@ -7855,6 +3579,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_auinotbk.h"\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_bannerwindow.h"\r
                                >\r
                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_bannerwindow.h"\r
                                >\r


@@ -8015,6 +3743,14 @@
                                RelativePath="..\..\include\wx\xrc\xh_radbx.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\xrc\xh_radbx.h"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_ribbon.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_richtext.h"\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_scrol.h"\r
                                >\r
                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_scrol.h"\r
                                >\r


@@ -8066,22 +3802,22 @@
                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_text.h"\r
                                >\r
                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_text.h"\r
                                >\r

-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\xrc\xh_tglbtn.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\xrc\xh_timectrl.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\xrc\xh_toolb.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\xrc\xh_toolbk.h"
-                               >
+                       </File>\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_toolbk.h"\r
+                               >\r

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


@@ -8103,6 +3839,10 @@
                                RelativePath="..\..\include\wx\xrc\xmlres.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\xrc\xmlres.h"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xmlreshandler.h"\r
+                               >\r
+                       </File>\r

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


@@ -8112,6 +3852,16 @@
                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\src\xrc\xmlreshandler.cpp"\r
+                               >\r
+                       </File>\r
+               </Filter>\r

        </Files>\r
        <Globals>\r
                \r
        </Files>\r
        <Globals>\r
                \r