compilation fix for wxUSE_UTF8_LOCALE_ONLY case

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

diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj
index 25241e418ab5a262e0ed875865f4256b27f099b0..96b25ddd11d9cbd3b8b779c7badddfb9e5576e12 100644 (file)
--- a/build/msw/wx_vc7_core.vcproj
+++ b/build/msw/wx_vc7_core.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>\r
+<?xml version="1.0" encoding="Windows-1252"?>\r

 <!--\r
 \r
   This makefile was generated by\r
 <!--\r
 \r
   This makefile was generated by\r

-  Bakefile 0.2.3 (http://www.bakefile.org)\r
+  Bakefile 0.2.5 (http://www.bakefile.org)\r

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


@@ -22,32 +22,16 @@
                        IntermediateDirectory="vc_mswunivudll\core"\r
                        ConfigurationType="2"\r
                        UseOfMFC="0"\r
                        IntermediateDirectory="vc_mswunivudll\core"\r
                        ConfigurationType="2"\r
                        UseOfMFC="0"\r

-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r

                        CharacterSet="1">\r
                        CharacterSet="1">\r

-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r

                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r

-                               InlineFunctionExpansion="1"\r

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

-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r

                                PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
                                PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r

-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r

                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_coredll.pch"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_coredll.pch"\r


@@ -55,40 +39,46 @@
                                ObjectFile="vc_mswunivudll\core\"\r
                                ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                ObjectFile="vc_mswunivudll\core\"\r
                                ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb"\r
                                WarningLevel="4"\r

-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\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
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r

                        <Tool\r
                                Name="VCLinkerTool"\r
                        <Tool\r
                                Name="VCLinkerTool"\r

-                               AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase29u.lib"\r

                                AdditionalOptions=""\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\wxmswuniv290u_core_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_core.lib"\r
                                OutputFile="..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_core.lib"\r

-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r

                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r

-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r

                                ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb"\r
                                TargetMachine="1"/>\r
                        <Tool\r

-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_dll\wx_vc7_core.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCFxCopTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_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
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"/>\r
+                       <Tool\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r

                </Configuration>\r
                <Configuration\r
                        Name="DLL Universal Debug|Win32"\r
                </Configuration>\r
                <Configuration\r
                        Name="DLL Universal Debug|Win32"\r


@@ -96,32 +86,19 @@
                        IntermediateDirectory="vc_mswunivuddll\core"\r
                        ConfigurationType="2"\r
                        UseOfMFC="0"\r
                        IntermediateDirectory="vc_mswunivuddll\core"\r
                        ConfigurationType="2"\r
                        UseOfMFC="0"\r

-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r

                        CharacterSet="1">\r
                        CharacterSet="1">\r

-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r

                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r

-                               InlineFunctionExpansion="1"\r

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

-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r

                                PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
                                PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r

+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r

                                BasicRuntimeChecks="3"\r
                                BasicRuntimeChecks="3"\r

-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r

                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_coredll.pch"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_coredll.pch"\r


@@ -129,40 +106,46 @@
                                ObjectFile="vc_mswunivuddll\core\"\r
                                ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                ObjectFile="vc_mswunivuddll\core\"\r
                                ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb"\r
                                WarningLevel="4"\r

-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\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
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r

                        <Tool\r
                                Name="VCLinkerTool"\r
                        <Tool\r
                                Name="VCLinkerTool"\r

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

                                AdditionalOptions=""\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\wxmswuniv290ud_core_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_core.lib"\r
                                OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_core.lib"\r

-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r

                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r

-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r

                                ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb"\r
                                TargetMachine="1"/>\r
                        <Tool\r

-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_dll\wx_vc7_core.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCFxCopTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_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
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"/>\r
+                       <Tool\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r

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


@@ -170,32 +153,16 @@
                        IntermediateDirectory="vc_mswudll\core"\r
                        ConfigurationType="2"\r
                        UseOfMFC="0"\r
                        IntermediateDirectory="vc_mswudll\core"\r
                        ConfigurationType="2"\r
                        UseOfMFC="0"\r

-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r

                        CharacterSet="1">\r
                        CharacterSet="1">\r

-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r

                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r

-                               InlineFunctionExpansion="1"\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

-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r

                                PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
                                PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r

-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r

                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_coredll.pch"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_coredll.pch"\r


@@ -203,40 +170,46 @@
                                ObjectFile="vc_mswudll\core\"\r
                                ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                ObjectFile="vc_mswudll\core\"\r
                                ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb"\r
                                WarningLevel="4"\r

-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\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
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r

                        <Tool\r
                                Name="VCLinkerTool"\r
                        <Tool\r
                                Name="VCLinkerTool"\r

-                               AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase29u.lib"\r

                                AdditionalOptions=""\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\wxmsw290u_core_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_core.lib"\r
                                OutputFile="..\..\lib\vc_dll\wxmsw290u_core_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_core.lib"\r

-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r

                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r

-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r

                                ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb"\r
                                TargetMachine="1"/>\r
                        <Tool\r

-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_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

                        <Tool\r
                        <Tool\r

-                               Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_dll\wx_vc7_core.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCFxCopTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCWebDeploymentTool"/>\r
+                       <Tool\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r

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


@@ -244,32 +217,19 @@
                        IntermediateDirectory="vc_mswuddll\core"\r
                        ConfigurationType="2"\r
                        UseOfMFC="0"\r
                        IntermediateDirectory="vc_mswuddll\core"\r
                        ConfigurationType="2"\r
                        UseOfMFC="0"\r

-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r

                        CharacterSet="1">\r
                        CharacterSet="1">\r

-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r

                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r

-                               InlineFunctionExpansion="1"\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

-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r

                                PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
                                PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r

+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r

                                BasicRuntimeChecks="3"\r
                                BasicRuntimeChecks="3"\r

-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r

                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_coredll.pch"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_coredll.pch"\r


@@ -277,40 +237,46 @@
                                ObjectFile="vc_mswuddll\core\"\r
                                ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                ObjectFile="vc_mswuddll\core\"\r
                                ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.pdb"\r
                                WarningLevel="4"\r

-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\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
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r

                        <Tool\r
                                Name="VCLinkerTool"\r
                        <Tool\r
                                Name="VCLinkerTool"\r

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

                                AdditionalOptions=""\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\wxmsw290ud_core_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_core.lib"\r
                                OutputFile="..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_core.lib"\r

-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r

                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r

-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r

                                ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.pdb"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.pdb"\r
                                TargetMachine="1"/>\r
                        <Tool\r

-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_dll\wx_vc7_core.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCFxCopTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCWebDeploymentTool"/>\r
+                       <Tool\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r

                </Configuration>\r
                <Configuration\r
                        Name="Universal Release|Win32"\r
                </Configuration>\r
                <Configuration\r
                        Name="Universal Release|Win32"\r


@@ -318,32 +284,16 @@
                        IntermediateDirectory="vc_mswunivu\core"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        IntermediateDirectory="vc_mswunivu\core"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r

-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r

                        CharacterSet="1">\r
                        CharacterSet="1">\r

-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r

                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r

-                               InlineFunctionExpansion="1"\r

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

-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r

                                PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
                                PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r

-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r

                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivu\wxprec_corelib.pch"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivu\wxprec_corelib.pch"\r


@@ -351,32 +301,38 @@
                                ObjectFile="vc_mswunivu\core\"\r
                                ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_core.pdb"\r
                                WarningLevel="4"\r
                                ObjectFile="vc_mswunivu\core\"\r
                                ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_core.pdb"\r
                                WarningLevel="4"\r

-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCManagedResourceCompilerTool"/>\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxmswuniv29u_core.lib"\r
+                               SuppressStartupBanner="TRUE"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCResourceCompilerTool"\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
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"/>\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r

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

-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmswuniv29u_core.lib"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_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

                        <Tool\r
                        <Tool\r

-                               Name="VCALinkTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc7_core.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCWebDeploymentTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCFxCopTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r

                </Configuration>\r
                <Configuration\r
                        Name="Universal Debug|Win32"\r
                </Configuration>\r
                <Configuration\r
                        Name="Universal Debug|Win32"\r


@@ -384,32 +340,19 @@
                        IntermediateDirectory="vc_mswunivud\core"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        IntermediateDirectory="vc_mswunivud\core"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r

-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r

                        CharacterSet="1">\r
                        CharacterSet="1">\r

-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r

                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r

-                               InlineFunctionExpansion="1"\r

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

-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r

                                PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
                                PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r

+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r

                                BasicRuntimeChecks="3"\r
                                BasicRuntimeChecks="3"\r

-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r

                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivud\wxprec_corelib.pch"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivud\wxprec_corelib.pch"\r


@@ -417,32 +360,38 @@
                                ObjectFile="vc_mswunivud\core\"\r
                                ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_core.pdb"\r
                                WarningLevel="4"\r
                                ObjectFile="vc_mswunivud\core\"\r
                                ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_core.pdb"\r
                                WarningLevel="4"\r

-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCManagedResourceCompilerTool"/>\r
+                               Name="VCCustomBuildTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCResourceCompilerTool"\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
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"/>\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_core.lib"\r
+                               SuppressStartupBanner="TRUE"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r

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

-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_core.lib"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_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

                        <Tool\r
                        <Tool\r

-                               Name="VCALinkTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc7_core.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCWebDeploymentTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCFxCopTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r

                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r


@@ -450,32 +399,16 @@
                        IntermediateDirectory="vc_mswu\core"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        IntermediateDirectory="vc_mswu\core"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r

-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r

                        CharacterSet="1">\r
                        CharacterSet="1">\r

-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r

                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r

-                               InlineFunctionExpansion="1"\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

-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r

                                PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
                                PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r

-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r

                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswu\wxprec_corelib.pch"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswu\wxprec_corelib.pch"\r


@@ -483,32 +416,38 @@
                                ObjectFile="vc_mswu\core\"\r
                                ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_core.pdb"\r
                                WarningLevel="4"\r
                                ObjectFile="vc_mswu\core\"\r
                                ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_core.pdb"\r
                                WarningLevel="4"\r

-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCManagedResourceCompilerTool"/>\r
+                               Name="VCCustomBuildTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCResourceCompilerTool"\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
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"/>\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxmsw29u_core.lib"\r
+                               SuppressStartupBanner="TRUE"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r

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

-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmsw29u_core.lib"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_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

                        <Tool\r
                        <Tool\r

-                               Name="VCALinkTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc7_core.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCWebDeploymentTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCFxCopTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r

                </Configuration>\r
                <Configuration\r
                        Name="Debug|Win32"\r
                </Configuration>\r
                <Configuration\r
                        Name="Debug|Win32"\r


@@ -516,32 +455,19 @@
                        IntermediateDirectory="vc_mswud\core"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        IntermediateDirectory="vc_mswud\core"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r

-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r

                        CharacterSet="1">\r
                        CharacterSet="1">\r

-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r

                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r

-                               InlineFunctionExpansion="1"\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

-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r

                                PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
                                PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r

+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r

                                BasicRuntimeChecks="3"\r
                                BasicRuntimeChecks="3"\r

-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r

                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswud\wxprec_corelib.pch"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswud\wxprec_corelib.pch"\r


@@ -549,32 +475,38 @@
                                ObjectFile="vc_mswud\core\"\r
                                ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_core.pdb"\r
                                WarningLevel="4"\r
                                ObjectFile="vc_mswud\core\"\r
                                ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_core.pdb"\r
                                WarningLevel="4"\r

-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCManagedResourceCompilerTool"/>\r
+                               Name="VCCustomBuildTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCResourceCompilerTool"\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
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"/>\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxmsw29ud_core.lib"\r
+                               SuppressStartupBanner="TRUE"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r

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

-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmsw29ud_core.lib"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCALinkTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc7_core.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCWebDeploymentTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCFxCopTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r

                </Configuration>\r
        </Configurations>\r
        <References>\r
                </Configuration>\r
        </Configurations>\r
        <References>\r


@@ -585,71 +517,104 @@
                        Name="Common Sources"\r
                        UniqueIdentifier="{A6A5C30D-BDB6-5050-906D-10A96065136C}">\r
                        <File\r
                        Name="Common Sources"\r
                        UniqueIdentifier="{A6A5C30D-BDB6-5050-906D-10A96065136C}">\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

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


@@ -702,141 +667,227 @@
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\common\effects.cpp"/>\r
+                               RelativePath="..\..\src\common\effects.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\event.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\fddlgcmn.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\filectrlcmn.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\filepickercmn.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\fldlgcmn.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\fontcmn.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\event.cpp"/>\r
+                               RelativePath="..\..\src\common\fontenumcmn.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\fddlgcmn.cpp"/>\r
+                               RelativePath="..\..\src\common\fontmap.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\filectrlcmn.cpp"/>\r
+                               RelativePath="..\..\src\common\fontpickercmn.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\filepickercmn.cpp"/>\r
+                               RelativePath="..\..\src\common\fontutilcmn.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\fldlgcmn.cpp"/>\r
+                               RelativePath="..\..\src\common\framecmn.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\fontcmn.cpp"/>\r
+                               RelativePath="..\..\src\common\fs_mem.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\fontenumcmn.cpp"/>\r
+                               RelativePath="..\..\src\common\gaugecmn.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\fontmap.cpp"/>\r
+                               RelativePath="..\..\src\common\gbsizer.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\fontpickercmn.cpp"/>\r
+                               RelativePath="..\..\src\common\gdicmn.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\fontutilcmn.cpp"/>\r
+                               RelativePath="..\..\src\common\geometry.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\framecmn.cpp"/>\r
+                               RelativePath="..\..\src\common\gifdecod.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\fs_mem.cpp"/>\r
+                               RelativePath="..\..\src\common\graphcmn.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\gaugecmn.cpp"/>\r
+                               RelativePath="..\..\src\common\headercolcmn.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\gbsizer.cpp"/>\r
+                               RelativePath="..\..\src\common\headerctrlcmn.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\gdicmn.cpp"/>\r
+                               RelativePath="..\..\src\common\helpbase.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\geometry.cpp"/>\r
+                               RelativePath="..\..\src\common\iconbndl.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\gifdecod.cpp"/>\r
+                               RelativePath="..\..\src\common\imagall.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\graphcmn.cpp"/>\r
+                               RelativePath="..\..\src\common\imagbmp.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\helpbase.cpp"/>\r
+                               RelativePath="..\..\src\common\image.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\iconbndl.cpp"/>\r
+                               RelativePath="..\..\src\common\imagfill.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\imagall.cpp"/>\r
+                               RelativePath="..\..\src\common\imaggif.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\imagbmp.cpp"/>\r
+                               RelativePath="..\..\src\common\imagiff.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\image.cpp"/>\r
+                               RelativePath="..\..\src\common\imagjpeg.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\imagfill.cpp"/>\r
+                               RelativePath="..\..\src\common\imagpcx.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\imaggif.cpp"/>\r
+                               RelativePath="..\..\src\common\imagpng.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\imagiff.cpp"/>\r
+                               RelativePath="..\..\src\common\imagpnm.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\imagjpeg.cpp"/>\r
+                               RelativePath="..\..\src\common\imagtga.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\imagpcx.cpp"/>\r
+                               RelativePath="..\..\src\common\imagtiff.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\imagpng.cpp"/>\r
+                               RelativePath="..\..\src\common\imagxpm.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\imagpnm.cpp"/>\r
+                               RelativePath="..\..\src\common\layout.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\imagtga.cpp"/>\r
+                               RelativePath="..\..\src\common\lboxcmn.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\imagtiff.cpp"/>\r
+                               RelativePath="..\..\src\common\listctrlcmn.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\imagxpm.cpp"/>\r
+                               RelativePath="..\..\src\common\matrix.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\layout.cpp"/>\r
+                               RelativePath="..\..\src\common\menucmn.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\lboxcmn.cpp"/>\r
+                               RelativePath="..\..\src\common\msgout.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\listctrlcmn.cpp"/>\r
+                               RelativePath="..\..\src\common\nbkbase.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\matrix.cpp"/>\r
+                               RelativePath="..\..\src\common\overlaycmn.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\nbkbase.cpp"/>\r
+                               RelativePath="..\..\src\common\pickerbase.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\overlaycmn.cpp"/>\r
+                               RelativePath="..\..\src\common\popupcmn.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\pickerbase.cpp"/>\r
+                               RelativePath="..\..\src\common\quantize.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\popupcmn.cpp"/>\r
+                               RelativePath="..\..\src\common\radiocmn.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\prntbase.cpp"/>\r
+                               RelativePath="..\..\src\common\rearrangectrl.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\quantize.cpp"/>\r
+                               RelativePath="..\..\src\common\rendcmn.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\radiocmn.cpp"/>\r
+                               RelativePath="..\..\src\common\rgncmn.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\rendcmn.cpp"/>\r
+                               RelativePath="..\..\src\common\settcmn.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\rgncmn.cpp"/>\r
+                               RelativePath="..\..\src\common\sizer.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\sizer.cpp"/>\r
+                               RelativePath="..\..\src\common\srchcmn.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\srchcmn.cpp"/>\r
+                               RelativePath="..\..\src\common\statbar.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\statbar.cpp"/>\r
+                               RelativePath="..\..\src\common\stattextcmn.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\stattextcmn.cpp"/>\r
+                               RelativePath="..\..\src\common\stockitem.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\stockitem.cpp"/>\r
+                               RelativePath="..\..\src\common\tbarbase.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\tbarbase.cpp"/>\r
+                               RelativePath="..\..\src\common\textcmn.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\textcmn.cpp"/>\r
+                               RelativePath="..\..\src\common\textentrycmn.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\textentrycmn.cpp"/>\r
+                               RelativePath="..\..\src\common\toplvcmn.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\toplvcmn.cpp"/>\r
+                               RelativePath="..\..\src\common\treebase.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\treebase.cpp"/>\r
+                               RelativePath="..\..\src\common\utilscmn.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\utilscmn.cpp"/>\r
+                               RelativePath="..\..\src\common\valgen.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\valgen.cpp"/>\r
+                               RelativePath="..\..\src\common\validate.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\validate.cpp"/>\r
+                               RelativePath="..\..\src\common\valtext.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\valtext.cpp"/>\r
+                               RelativePath="..\..\src\common\wincmn.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\wincmn.cpp"/>\r
+                               RelativePath="..\..\src\common\windowid.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\windowid.cpp"/>\r
+                               RelativePath="..\..\src\common\wrapsizer.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

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

                </Filter>\r
                <Filter\r
                        Name="MSW Sources"\r
                </Filter>\r
                <Filter\r
                        Name="MSW Sources"\r


@@ -845,841 +896,923 @@
                                RelativePath="..\..\src\msw\accel.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                                RelativePath="..\..\src\msw\accel.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\ole\access.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\ole\access.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r

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

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\app.cpp">\r

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

-                               RelativePath="..\..\src\msw\app.cpp"/>\r
+                               RelativePath="..\..\src\msw\artmsw.cpp">\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                       </File>\r

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                                RelativePath="..\..\src\msw\bmpbuttn.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                        <File\r
                                RelativePath="..\..\src\msw\bmpbuttn.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

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

                        <File\r
                                RelativePath="..\..\src\msw\button.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                        <File\r
                                RelativePath="..\..\src\msw\button.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

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

                        <File\r
                                RelativePath="..\..\src\msw\checkbox.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                        <File\r
                                RelativePath="..\..\src\msw\checkbox.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\checklst.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\checklst.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\choice.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\choice.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

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

                        <File\r
                                RelativePath="..\..\src\msw\colordlg.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                        <File\r
                                RelativePath="..\..\src\msw\colordlg.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

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

                        <File\r
                                RelativePath="..\..\src\msw\combo.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                        <File\r
                                RelativePath="..\..\src\msw\combo.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\combobox.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\combobox.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\control.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\control.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                                RelativePath="..\..\src\msw\dialog.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                        <File\r
                                RelativePath="..\..\src\msw\dialog.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

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

                        <File\r
                        <File\r

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

                        <File\r
                                RelativePath="..\..\src\msw\dirdlg.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                        <File\r
                                RelativePath="..\..\src\msw\dirdlg.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

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

                        <File\r
                                RelativePath="..\..\src\msw\dragimag.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                        <File\r
                                RelativePath="..\..\src\msw\dragimag.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                                RelativePath="..\..\src\msw\fdrepdlg.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                        <File\r
                                RelativePath="..\..\src\msw\fdrepdlg.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\filedlg.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\filedlg.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

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

                        <File\r
                                RelativePath="..\..\src\msw\fontdlg.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                        <File\r
                                RelativePath="..\..\src\msw\fontdlg.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

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

                        <File\r
                        <File\r

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

                        <File\r
                                RelativePath="..\..\src\msw\frame.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                        <File\r
                                RelativePath="..\..\src\msw\frame.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                               RelativePath="..\..\src\msw\gauge95.cpp">\r
+                               RelativePath="..\..\src\msw\gauge.cpp">\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\gdiimage.cpp">\r

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

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

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\msw\gdiobj.cpp"/>\r
+                               RelativePath="..\..\src\msw\gdiplus.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\msw\gdiplus.cpp"/>\r
+                               RelativePath="..\..\src\msw\graphics.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\msw\graphics.cpp"/>\r
+                               RelativePath="..\..\src\msw\headerctrl.cpp">\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                       </File>\r

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                                RelativePath="..\..\src\msw\iniconf.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                        <File\r
                                RelativePath="..\..\src\msw\iniconf.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\listbox.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\listbox.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\listctrl.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\listctrl.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

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

                        <File\r
                                RelativePath="..\..\src\msw\mdi.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                        <File\r
                                RelativePath="..\..\src\msw\mdi.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\menu.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\menu.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\menuitem.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\menuitem.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\metafile.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\metafile.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

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

                        <File\r
                                RelativePath="..\..\src\msw\msgdlg.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                        <File\r
                                RelativePath="..\..\src\msw\msgdlg.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

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

                        <File\r
                                RelativePath="..\..\src\msw\nativdlg.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                        <File\r
                                RelativePath="..\..\src\msw\nativdlg.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\nativewin.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\nativewin.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\notebook.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\notebook.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

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

                        <File\r
                                RelativePath="..\..\src\msw\ownerdrw.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                        <File\r
                                RelativePath="..\..\src\msw\ownerdrw.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                                RelativePath="..\..\src\msw\radiobox.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                        <File\r
                                RelativePath="..\..\src\msw\radiobox.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\radiobut.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\radiobut.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

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

                        <File\r
                        <File\r

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

                        <File\r
                                RelativePath="..\..\src\msw\scrolbar.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                        <File\r
                                RelativePath="..\..\src\msw\scrolbar.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

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

                        <File\r
                        <File\r

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

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\spinbutt.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\spinbutt.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\spinctrl.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\spinctrl.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\statbmp.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\statbmp.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\statbox.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\statbox.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r

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

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\statline.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\statline.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\stattext.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\stattext.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

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

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                               RelativePath="..\..\src\msw\tbar95.cpp">\r
+                               RelativePath="..\..\src\msw\textctrl.cpp">\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

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

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

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

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

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

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

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

                        <File\r
                        <File\r

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

                        <File\r
                                RelativePath="..\..\src\msw\treectrl.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                        <File\r
                                RelativePath="..\..\src\msw\treectrl.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                                RelativePath="..\..\src\msw\version.rc">\r
                                <FileConfiguration\r
                                        Name="Universal Release|Win32"\r
                        <File\r
                                RelativePath="..\..\src\msw\version.rc">\r
                                <FileConfiguration\r
                                        Name="Universal Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

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

                        <File\r
                        <File\r

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

                </Filter>\r
                <Filter\r
                        Name="Generic Sources"\r
                </Filter>\r
                <Filter\r
                        Name="Generic Sources"\r


@@ -1688,233 +1821,260 @@
                                RelativePath="..\..\src\generic\accel.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                                RelativePath="..\..\src\generic\accel.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

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

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\generic\buttonbar.cpp"/>\r
+                               RelativePath="..\..\src\generic\buttonbar.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\generic\choicbkg.cpp"/>\r
+                               RelativePath="..\..\src\generic\choicbkg.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\generic\choicdgg.cpp"/>\r
+                               RelativePath="..\..\src\generic\choicdgg.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\generic\clrpickerg.cpp"/>\r
+                               RelativePath="..\..\src\generic\clrpickerg.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\generic\collpaneg.cpp"/>\r
+                               RelativePath="..\..\src\generic\collpaneg.cpp">\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\generic\colrdlgg.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                        <File\r
                                RelativePath="..\..\src\generic\colrdlgg.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                               RelativePath="..\..\src\generic\combog.cpp"/>\r
+                               RelativePath="..\..\src\generic\combog.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\generic\dcpsg.cpp"/>\r
+                               RelativePath="..\..\src\generic\dcpsg.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\generic\dirctrlg.cpp"/>\r
+                               RelativePath="..\..\src\generic\dirctrlg.cpp">\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\generic\dirdlgg.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                        <File\r
                                RelativePath="..\..\src\generic\dirdlgg.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

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

                        <File\r
                                RelativePath="..\..\src\generic\fdrepdlg.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                        <File\r
                                RelativePath="..\..\src\generic\fdrepdlg.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

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

                        <File\r
                                RelativePath="..\..\src\generic\filedlgg.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                        <File\r
                                RelativePath="..\..\src\generic\filedlgg.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

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

                        <File\r
                                RelativePath="..\..\src\generic\fontdlgg.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                        <File\r
                                RelativePath="..\..\src\generic\fontdlgg.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\fontpickerg.cpp">\r

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

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

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\generic\listbkg.cpp"/>\r
+                               RelativePath="..\..\src\generic\listbkg.cpp">\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\generic\listctrl.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                        <File\r
                                RelativePath="..\..\src\generic\listctrl.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

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

                        <File\r
                                RelativePath="..\..\src\generic\mdig.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                        <File\r
                                RelativePath="..\..\src\generic\mdig.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\generic\msgdlgg.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\generic\msgdlgg.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\generic\printps.cpp"/>\r
+                               RelativePath="..\..\src\generic\progdlgg.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\generic\prntdlgg.cpp"/>\r
+                               RelativePath="..\..\src\generic\renderg.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\generic\progdlgg.cpp"/>\r
+                               RelativePath="..\..\src\generic\scrlwing.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\generic\renderg.cpp"/>\r
+                               RelativePath="..\..\src\generic\selstore.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\generic\scrlwing.cpp"/>\r
+                               RelativePath="..\..\src\generic\spinctlg.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\generic\selstore.cpp"/>\r
+                               RelativePath="..\..\src\generic\splitter.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\generic\spinctlg.cpp"/>\r
+                               RelativePath="..\..\src\generic\srchctlg.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\generic\splitter.cpp"/>\r
+                               RelativePath="..\..\src\generic\statbmpg.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\generic\srchctlg.cpp"/>\r
+                               RelativePath="..\..\src\generic\stattextg.cpp">\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\generic\statusbr.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                        <File\r
                                RelativePath="..\..\src\generic\statusbr.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                               RelativePath="..\..\src\generic\tabg.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"/>\r
+                               RelativePath="..\..\src\generic\textdlgg.cpp">\r

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

-                               RelativePath="..\..\src\generic\textdlgg.cpp"/>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\tipwin.cpp"/>\r
+                               RelativePath="..\..\src\generic\tipwin.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\generic\toolbkg.cpp"/>\r
+                               RelativePath="..\..\src\generic\toolbkg.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\generic\treebkg.cpp"/>\r
+                               RelativePath="..\..\src\generic\treebkg.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\generic\treectlg.cpp"/>\r
+                               RelativePath="..\..\src\generic\treectlg.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\generic\vlbox.cpp"/>\r
+                               RelativePath="..\..\src\generic\vlbox.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\generic\vscroll.cpp"/>\r
+                               RelativePath="..\..\src\generic\vscroll.cpp">\r
+                       </File>\r

                </Filter>\r
                <Filter\r
                        Name="wxUniv Sources"\r
                </Filter>\r
                <Filter\r
                        Name="wxUniv Sources"\r


@@ -1923,601 +2083,601 @@
                                RelativePath="..\..\src\univ\bmpbuttn.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                                RelativePath="..\..\src\univ\bmpbuttn.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\button.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\button.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\checkbox.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\checkbox.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\checklst.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\checklst.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\choice.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\choice.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                               RelativePath="..\..\src\univ\colschem.cpp">\r
+                               RelativePath="..\..\src\univ\combobox.cpp">\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\combobox.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\control.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\control.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\ctrlrend.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\ctrlrend.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\dialog.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\dialog.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\framuniv.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\framuniv.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\gauge.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\gauge.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\themes\gtk.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\themes\gtk.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\inpcons.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\inpcons.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\inphand.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\inphand.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\listbox.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\listbox.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\menu.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\menu.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\themes\metal.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\themes\metal.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\themes\mono.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\themes\mono.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\notebook.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\notebook.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\radiobox.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\radiobox.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\radiobut.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\radiobut.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\scrarrow.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\scrarrow.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\scrolbar.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\scrolbar.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\scrthumb.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\scrthumb.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\univ\settingsuniv.cpp">\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\slider.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\slider.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\spinbutt.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\spinbutt.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\statbmp.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\statbmp.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\statbox.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\statbox.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\statline.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\statline.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\stattext.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\stattext.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\statusbr.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\statusbr.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\stdrend.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\stdrend.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\textctrl.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\textctrl.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\tglbtn.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\tglbtn.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\theme.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\theme.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\toolbar.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\toolbar.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\topluniv.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\topluniv.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\themes\win32.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\themes\win32.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\winuniv.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\winuniv.cpp">\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

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


@@ -2622,95 +2782,146 @@
                        Name="MSW Headers"\r
                        UniqueIdentifier="{5AFFF20E-29F9-512B-B80A-7DC45976CDAC}">\r
                        <File\r
                        Name="MSW Headers"\r
                        UniqueIdentifier="{5AFFF20E-29F9-512B-B80A-7DC45976CDAC}">\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\accel.h"/>\r
+                               RelativePath="..\..\include\wx\msw\accel.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\ole\access.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\ole\activex.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\ole\access.h"/>\r
+                               RelativePath="..\..\include\wx\msw\app.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\ole\activex.h"/>\r
+                               RelativePath="..\..\include\wx\msw\ole\automtn.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\app.h"/>\r
+                               RelativePath="..\..\include\wx\msw\bitmap.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\ole\automtn.h"/>\r
+                               RelativePath="..\..\include\wx\msw\bmpbuttn.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\bitmap.h"/>\r
+                               RelativePath="..\..\include\wx\msw\bmpcbox.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\bmpbuttn.h"/>\r
+                               RelativePath="..\..\include\wx\msw\brush.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\brush.h"/>\r
+                               RelativePath="..\..\include\wx\msw\button.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\button.h"/>\r
+                               RelativePath="..\..\include\wx\msw\calctrl.h">\r
+                       </File>\r

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\ole\dataform.h"/>\r
+                               RelativePath="..\..\include\wx\msw\ole\dataform.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\ole\dataobj.h"/>\r
+                               RelativePath="..\..\include\wx\msw\ole\dataobj.h">\r
+                       </File>\r

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\ole\dropsrc.h"/>\r
+                               RelativePath="..\..\include\wx\msw\ole\dropsrc.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\ole\droptgt.h"/>\r
+                               RelativePath="..\..\include\wx\msw\ole\droptgt.h">\r
+                       </File>\r

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\gauge95.h"/>\r
+                               RelativePath="..\..\include\wx\msw\gauge.h">\r
+                       </File>\r

                        <File\r
                        <File\r

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

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


@@ -2787,885 +2998,1380 @@
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r

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

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\helpbest.h"/>\r
+                               RelativePath="..\..\include\wx\msw\headerctrl.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\helpchm.h"/>\r
+                               RelativePath="..\..\include\wx\msw\helpbest.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\helpwin.h"/>\r
+                               RelativePath="..\..\include\wx\msw\helpchm.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\htmlhelp.h"/>\r
+                               RelativePath="..\..\include\wx\msw\helpwin.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\icon.h"/>\r
+                               RelativePath="..\..\include\wx\msw\htmlhelp.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\imaglist.h"/>\r
+                               RelativePath="..\..\include\wx\msw\icon.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\iniconf.h"/>\r
+                               RelativePath="..\..\include\wx\msw\imaglist.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\joystick.h"/>\r
+                               RelativePath="..\..\include\wx\msw\iniconf.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\listbox.h"/>\r
+                               RelativePath="..\..\include\wx\msw\joystick.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\listctrl.h"/>\r
+                               RelativePath="..\..\include\wx\msw\listbox.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\mdi.h"/>\r
+                               RelativePath="..\..\include\wx\msw\listctrl.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\menu.h"/>\r
+                               RelativePath="..\..\include\wx\msw\mdi.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\menuitem.h"/>\r
+                               RelativePath="..\..\include\wx\msw\menu.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\metafile.h"/>\r
+                               RelativePath="..\..\include\wx\msw\menuitem.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\minifram.h"/>\r
+                               RelativePath="..\..\include\wx\msw\metafile.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\missing.h"/>\r
+                               RelativePath="..\..\include\wx\msw\minifram.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\msgdlg.h"/>\r
+                               RelativePath="..\..\include\wx\msw\missing.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\msvcrt.h"/>\r
+                               RelativePath="..\..\include\wx\msw\msgdlg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\pen.h"/>\r
+                               RelativePath="..\..\include\wx\msw\palette.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\popupwin.h"/>\r
+                               RelativePath="..\..\include\wx\msw\pen.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\printdlg.h"/>\r
+                               RelativePath="..\..\include\wx\msw\popupwin.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\printwin.h"/>\r
+                               RelativePath="..\..\include\wx\msw\printdlg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\radiobox.h"/>\r
+                               RelativePath="..\..\include\wx\msw\printwin.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\radiobut.h"/>\r
+                               RelativePath="..\..\include\wx\msw\radiobox.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\rcdefs.h"/>\r
+                               RelativePath="..\..\include\wx\msw\radiobut.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\region.h"/>\r
+                               RelativePath="..\..\include\wx\msw\rcdefs.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\scrolbar.h"/>\r
+                               RelativePath="..\..\include\wx\msw\region.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\setup0.h"/>\r
+                               RelativePath="..\..\include\wx\msw\scrolbar.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\slider95.h"/>\r
+                               RelativePath="..\..\include\wx\msw\setup0.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\sound.h"/>\r
+                               RelativePath="..\..\include\wx\msw\slider.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\spinbutt.h"/>\r
+                               RelativePath="..\..\include\wx\msw\sound.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\spinctrl.h"/>\r
+                               RelativePath="..\..\include\wx\msw\spinbutt.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\statbmp.h"/>\r
+                               RelativePath="..\..\include\wx\msw\spinctrl.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\statbox.h"/>\r
+                               RelativePath="..\..\include\wx\msw\statbmp.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\statbr95.h"/>\r
+                               RelativePath="..\..\include\wx\msw\statbox.h">\r
+                       </File>\r

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\tabctrl.h"/>\r
+                               RelativePath="..\..\include\wx\msw\statusbar.h">\r
+                       </File>\r

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\tbar95.h"/>\r
+                               RelativePath="..\..\include\wx\msw\textctrl.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\textctrl.h"/>\r
+                               RelativePath="..\..\include\wx\msw\textentry.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\textentry.h"/>\r
+                               RelativePath="..\..\include\wx\msw\tglbtn.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\tglbtn.h"/>\r
+                               RelativePath="..\..\include\wx\msw\toolbar.h">\r
+                       </File>\r

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\ole\uuid.h"/>\r
+                               RelativePath="..\..\include\wx\msw\ole\uuid.h">\r
+                       </File>\r

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                </Filter>\r
                <Filter\r
                        Name="Generic Headers"\r
                        UniqueIdentifier="{61C63C83-EF8C-51CA-A418-51936E7FCD4A}">\r
                        <File\r
                </Filter>\r
                <Filter\r
                        Name="Generic Headers"\r
                        UniqueIdentifier="{61C63C83-EF8C-51CA-A418-51936E7FCD4A}">\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\aboutdlgg.h"/>\r
+                               RelativePath="..\..\include\wx\generic\aboutdlgg.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\accel.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\animate.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\bmpcbox.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\accel.h"/>\r
+                               RelativePath="..\..\include\wx\generic\busyinfo.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\animate.h"/>\r
+                               RelativePath="..\..\include\wx\generic\buttonbar.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\bmpcbox.h"/>\r
+                               RelativePath="..\..\include\wx\generic\calctrlg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\busyinfo.h"/>\r
+                               RelativePath="..\..\include\wx\generic\choicdgg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\buttonbar.h"/>\r
+                               RelativePath="..\..\include\wx\generic\clrpickerg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\calctrl.h"/>\r
+                               RelativePath="..\..\include\wx\generic\collpaneg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\choicdgg.h"/>\r
+                               RelativePath="..\..\include\wx\generic\colrdlgg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\clrpickerg.h"/>\r
+                               RelativePath="..\..\include\wx\generic\combo.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\collpaneg.h"/>\r
+                               RelativePath="..\..\include\wx\generic\ctrlsub.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\colrdlgg.h"/>\r
+                               RelativePath="..\..\include\wx\generic\dataview.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\combo.h"/>\r
+                               RelativePath="..\..\include\wx\generic\datectrl.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\ctrlsub.h"/>\r
+                               RelativePath="..\..\include\wx\generic\dcpsg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\dataview.h"/>\r
+                               RelativePath="..\..\include\wx\generic\dirctrlg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\datectrl.h"/>\r
+                               RelativePath="..\..\include\wx\generic\dirdlgg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\dcpsg.h"/>\r
+                               RelativePath="..\..\include\wx\generic\dragimgg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\dirctrlg.h"/>\r
+                               RelativePath="..\..\include\wx\generic\fdrepdlg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\dirdlgg.h"/>\r
+                               RelativePath="..\..\include\wx\generic\filectrlg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\dragimgg.h"/>\r
+                               RelativePath="..\..\include\wx\generic\filedlgg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\filedlgg.h"/>\r
+                               RelativePath="..\..\include\wx\generic\fontpickerg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\fontpickerg.h"/>\r
+                               RelativePath="..\..\include\wx\generic\grideditors.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\grid.h"/>\r
+                               RelativePath="..\..\include\wx\generic\gridsel.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\gridctrl.h"/>\r
+                               RelativePath="..\..\include\wx\generic\headerctrlg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\gridsel.h"/>\r
+                               RelativePath="..\..\include\wx\generic\helpext.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\helpext.h"/>\r
+                               RelativePath="..\..\include\wx\generic\hyperlink.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\hyperlink.h"/>\r
+                               RelativePath="..\..\include\wx\generic\laywin.h">\r
+                       </File>\r

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\msgdlgg.h"/>\r
+                               RelativePath="..\..\include\wx\generic\notebook.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\notebook.h"/>\r
+                               RelativePath="..\..\include\wx\generic\notifmsg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\notifmsg.h"/>\r
+                               RelativePath="..\..\include\wx\generic\numdlgg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\numdlgg.h"/>\r
+                               RelativePath="..\..\include\wx\generic\panelg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\panelg.h"/>\r
+                               RelativePath="..\..\include\wx\generic\printps.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\printps.h"/>\r
+                               RelativePath="..\..\include\wx\generic\prntdlgg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\prntdlgg.h"/>\r
+                               RelativePath="..\..\include\wx\generic\progdlgg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\progdlgg.h"/>\r
+                               RelativePath="..\..\include\wx\generic\propdlg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\propdlg.h"/>\r
+                               RelativePath="..\..\include\wx\generic\sashwin.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\sashwin.h"/>\r
+                               RelativePath="..\..\include\wx\generic\scrolwin.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\scrolwin.h"/>\r
+                               RelativePath="..\..\include\wx\generic\spinctlg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\spinctlg.h"/>\r
+                               RelativePath="..\..\include\wx\generic\splash.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\splash.h"/>\r
+                               RelativePath="..\..\include\wx\generic\splitter.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\splitter.h"/>\r
+                               RelativePath="..\..\include\wx\generic\srchctlg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\srchctlg.h"/>\r
+                               RelativePath="..\..\include\wx\generic\statbmpg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\statusbr.h"/>\r
+                               RelativePath="..\..\include\wx\generic\stattextg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\tabg.h"/>\r
+                               RelativePath="..\..\include\wx\generic\statusbr.h">\r
+                       </File>\r

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                </Filter>\r
                <Filter\r
                        Name="wxUniv Headers"\r
                        UniqueIdentifier="{46168D7C-2783-50F3-AE9D-A740D5FF0B44}">\r
                        <File\r
                </Filter>\r
                <Filter\r
                        Name="wxUniv Headers"\r
                        UniqueIdentifier="{46168D7C-2783-50F3-AE9D-A740D5FF0B44}">\r
                        <File\r

-                               RelativePath="..\..\include\wx\univ\app.h"/>\r
+                               RelativePath="..\..\include\wx\univ\app.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\univ\bmpbuttn.h"/>\r
+                               RelativePath="..\..\include\wx\univ\bmpbuttn.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\univ\button.h"/>\r
+                               RelativePath="..\..\include\wx\univ\button.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\univ\checkbox.h"/>\r
+                               RelativePath="..\..\include\wx\univ\checkbox.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\univ\checklst.h"/>\r
+                               RelativePath="..\..\include\wx\univ\checklst.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\univ\chkconf.h"/>\r
+                               RelativePath="..\..\include\wx\univ\chkconf.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\univ\choice.h"/>\r
+                               RelativePath="..\..\include\wx\univ\choice.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\univ\colschem.h"/>\r
+                               RelativePath="..\..\include\wx\univ\colschem.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\univ\combobox.h"/>\r
+                               RelativePath="..\..\include\wx\univ\combobox.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\univ\control.h"/>\r
+                               RelativePath="..\..\include\wx\univ\control.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\univ\dialog.h"/>\r
+                               RelativePath="..\..\include\wx\univ\dialog.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\univ\frame.h"/>\r
+                               RelativePath="..\..\include\wx\univ\frame.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\univ\gauge.h"/>\r
+                               RelativePath="..\..\include\wx\univ\gauge.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\univ\inpcons.h"/>\r
+                               RelativePath="..\..\include\wx\univ\inpcons.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\univ\inphand.h"/>\r
+                               RelativePath="..\..\include\wx\univ\inphand.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\univ\listbox.h"/>\r
+                               RelativePath="..\..\include\wx\univ\listbox.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\univ\menu.h"/>\r
+                               RelativePath="..\..\include\wx\univ\menu.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\univ\menuitem.h"/>\r
+                               RelativePath="..\..\include\wx\univ\menuitem.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\univ\notebook.h"/>\r
+                               RelativePath="..\..\include\wx\univ\notebook.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\univ\radiobox.h"/>\r
+                               RelativePath="..\..\include\wx\univ\radiobox.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\univ\radiobut.h"/>\r
+                               RelativePath="..\..\include\wx\univ\radiobut.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\univ\renderer.h"/>\r
+                               RelativePath="..\..\include\wx\univ\renderer.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\univ\scrarrow.h"/>\r
+                               RelativePath="..\..\include\wx\univ\scrarrow.h">\r
+                       </File>\r

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\univ\scrthumb.h"/>\r
+                               RelativePath="..\..\include\wx\univ\scrthumb.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\univ\scrtimer.h"/>\r
+                               RelativePath="..\..\include\wx\univ\scrtimer.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\univ\slider.h"/>\r
+                               RelativePath="..\..\include\wx\univ\slider.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\univ\spinbutt.h"/>\r
+                               RelativePath="..\..\include\wx\univ\spinbutt.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\univ\statbmp.h"/>\r
+                               RelativePath="..\..\include\wx\univ\statbmp.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\univ\statbox.h"/>\r
+                               RelativePath="..\..\include\wx\univ\statbox.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\univ\statline.h"/>\r
+                               RelativePath="..\..\include\wx\univ\statline.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\univ\stattext.h"/>\r
+                               RelativePath="..\..\include\wx\univ\stattext.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\univ\statusbr.h"/>\r
+                               RelativePath="..\..\include\wx\univ\statusbr.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\univ\stdrend.h"/>\r
+                               RelativePath="..\..\include\wx\univ\stdrend.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\univ\textctrl.h"/>\r
+                               RelativePath="..\..\include\wx\univ\textctrl.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\univ\tglbtn.h"/>\r
+                               RelativePath="..\..\include\wx\univ\tglbtn.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\univ\theme.h"/>\r
+                               RelativePath="..\..\include\wx\univ\theme.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\univ\toolbar.h"/>\r
+                               RelativePath="..\..\include\wx\univ\toolbar.h">\r
+                       </File>\r

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                </Filter>\r
                <Filter\r
                        Name="wxHTML Headers"\r
                        UniqueIdentifier="{B4103426-A5DB-5CF0-A30E-BC9546513AAF}">\r
                        <File\r
                </Filter>\r
                <Filter\r
                        Name="wxHTML Headers"\r
                        UniqueIdentifier="{B4103426-A5DB-5CF0-A30E-BC9546513AAF}">\r
                        <File\r

-                               RelativePath="..\..\include\wx\html\helpctrl.h"/>\r
+                               RelativePath="..\..\include\wx\html\helpctrl.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\html\helpdata.h"/>\r
+                               RelativePath="..\..\include\wx\html\helpdata.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\html\helpdlg.h"/>\r
+                               RelativePath="..\..\include\wx\html\helpdlg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\html\helpfrm.h"/>\r
+                               RelativePath="..\..\include\wx\html\helpfrm.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\html\helpwnd.h"/>\r
+                               RelativePath="..\..\include\wx\html\helpwnd.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\html\htmlcell.h"/>\r
+                               RelativePath="..\..\include\wx\html\htmlcell.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\html\htmldefs.h"/>\r
+                               RelativePath="..\..\include\wx\html\htmldefs.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\html\htmlfilt.h"/>\r
+                               RelativePath="..\..\include\wx\html\htmlfilt.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\html\htmlpars.h"/>\r
+                               RelativePath="..\..\include\wx\html\htmlpars.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\html\htmlproc.h"/>\r
+                               RelativePath="..\..\include\wx\html\htmlproc.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\html\htmltag.h"/>\r
+                               RelativePath="..\..\include\wx\html\htmltag.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\html\htmlwin.h"/>\r
+                               RelativePath="..\..\include\wx\html\htmlwin.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\html\htmprint.h"/>\r
+                               RelativePath="..\..\include\wx\html\htmprint.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\html\m_templ.h"/>\r
+                               RelativePath="..\..\include\wx\html\m_templ.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\html\winpars.h"/>\r
+                               RelativePath="..\..\include\wx\html\winpars.h">\r
+                       </File>\r

                </Filter>\r
                <Filter\r
                        Name="Common Headers"\r
                        UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}">\r
                        <File\r
                </Filter>\r
                <Filter\r
                        Name="Common Headers"\r
                        UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}">\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\anidecod.h"/>\r
+                               RelativePath="..\..\include\wx\propgrid\advprops.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\animate.h"/>\r
+                               RelativePath="..\..\include\wx\anidecod.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\animdecod.h"/>\r
+                               RelativePath="..\..\include\wx\animate.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\artprov.h"/>\r
+                               RelativePath="..\..\include\wx\animdecod.h">\r
+                       </File>\r

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\bitmap.h"/>\r
+                               RelativePath="..\..\include\wx\aui\auibar.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\bmpbuttn.h"/>\r
+                               RelativePath="..\..\include\wx\aui\auibook.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\bmpcbox.h"/>\r
+                               RelativePath="..\..\include\wx\bitmap.h">\r
+                       </File>\r

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\brush.h"/>\r
+                               RelativePath="..\..\include\wx\bmpcbox.h">\r
+                       </File>\r

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\calctrl.h"/>\r
+                               RelativePath="..\..\include\wx\busyinfo.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\caret.h"/>\r
+                               RelativePath="..\..\include\wx\button.h">\r
+                       </File>\r

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\checklst.h"/>\r
+                               RelativePath="..\..\include\wx\calctrl.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\choicdlg.h"/>\r
+                               RelativePath="..\..\include\wx\caret.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\choice.h"/>\r
+                               RelativePath="..\..\include\wx\checkbox.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\choicebk.h"/>\r
+                               RelativePath="..\..\include\wx\checklst.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\clipbrd.h"/>\r
+                               RelativePath="..\..\include\wx\choicdlg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\clrpicker.h"/>\r
+                               RelativePath="..\..\include\wx\choice.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\cmdproc.h"/>\r
+                               RelativePath="..\..\include\wx\choicebk.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\cmndata.h"/>\r
+                               RelativePath="..\..\include\wx\clipbrd.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\collpane.h"/>\r
+                               RelativePath="..\..\include\wx\clrpicker.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\colordlg.h"/>\r
+                               RelativePath="..\..\include\wx\cmdproc.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\colour.h"/>\r
+                               RelativePath="..\..\include\wx\cmndata.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\combo.h"/>\r
+                               RelativePath="..\..\include\wx\collpane.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\combobox.h"/>\r
+                               RelativePath="..\..\include\wx\colordlg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\control.h"/>\r
+                               RelativePath="..\..\include\wx\colour.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\cshelp.h"/>\r
+                               RelativePath="..\..\include\wx\combo.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\ctrlsub.h"/>\r
+                               RelativePath="..\..\include\wx\combobox.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\cursor.h"/>\r
+                               RelativePath="..\..\include\wx\control.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\dataobj.h"/>\r
+                               RelativePath="..\..\include\wx\cshelp.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\dataview.h"/>\r
+                               RelativePath="..\..\include\wx\ctrlsub.h">\r
+                       </File>\r

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\dateevt.h"/>\r
+                               RelativePath="..\..\include\wx\dataobj.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\dc.h"/>\r
+                               RelativePath="..\..\include\wx\dataview.h">\r
+                       </File>\r

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\dcgraph.h"/>\r
+                               RelativePath="..\..\include\wx\dc.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\dcmemory.h"/>\r
+                               RelativePath="..\..\include\wx\dcbuffer.h">\r
+                       </File>\r

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\dcprint.h"/>\r
+                               RelativePath="..\..\include\wx\dcgraph.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\dcps.h"/>\r
+                               RelativePath="..\..\include\wx\dcmemory.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\dcscreen.h"/>\r
+                               RelativePath="..\..\include\wx\dcmirror.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\dcsvg.h"/>\r
+                               RelativePath="..\..\include\wx\dcprint.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\debugrpt.h"/>\r
+                               RelativePath="..\..\include\wx\dcps.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\dialog.h"/>\r
+                               RelativePath="..\..\include\wx\dcscreen.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\dialup.h"/>\r
+                               RelativePath="..\..\include\wx\dcsvg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\dirctrl.h"/>\r
+                               RelativePath="..\..\include\wx\debugrpt.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\dirdlg.h"/>\r
+                               RelativePath="..\..\include\wx\dialog.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\display.h"/>\r
+                               RelativePath="..\..\include\wx\dialup.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\display_impl.h"/>\r
+                               RelativePath="..\..\include\wx\dirctrl.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\dnd.h"/>\r
+                               RelativePath="..\..\include\wx\dirdlg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\aui\dockart.h"/>\r
+                               RelativePath="..\..\include\wx\display.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\docmdi.h"/>\r
+                               RelativePath="..\..\include\wx\display_impl.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\docview.h"/>\r
+                               RelativePath="..\..\include\wx\dnd.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\dragimag.h"/>\r
+                               RelativePath="..\..\include\wx\aui\dockart.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\editlbox.h"/>\r
+                               RelativePath="..\..\include\wx\docmdi.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\effects.h"/>\r
+                               RelativePath="..\..\include\wx\docview.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\encinfo.h"/>\r
+                               RelativePath="..\..\include\wx\dragimag.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\evtloop.h"/>\r
+                               RelativePath="..\..\include\wx\editlbox.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\fdrepdlg.h"/>\r
+                               RelativePath="..\..\include\wx\propgrid\editors.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\filectrl.h"/>\r
+                               RelativePath="..\..\include\wx\effects.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\filedlg.h"/>\r
+                               RelativePath="..\..\include\wx\encinfo.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\filepicker.h"/>\r
+                               RelativePath="..\..\include\wx\evtloop.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\aui\floatpane.h"/>\r
+                               RelativePath="..\..\include\wx\fdrepdlg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\fmappriv.h"/>\r
+                               RelativePath="..\..\include\wx\filectrl.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\font.h"/>\r
+                               RelativePath="..\..\include\wx\filedlg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\fontdlg.h"/>\r
+                               RelativePath="..\..\include\wx\filepicker.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\fontenum.h"/>\r
+                               RelativePath="..\..\include\wx\aui\floatpane.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\fontpicker.h"/>\r
+                               RelativePath="..\..\include\wx\fmappriv.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\fontutil.h"/>\r
+                               RelativePath="..\..\include\wx\font.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\frame.h"/>\r
+                               RelativePath="..\..\include\wx\fontdlg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\aui\framemanager.h"/>\r
+                               RelativePath="..\..\include\wx\fontenum.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\gauge.h"/>\r
+                               RelativePath="..\..\include\wx\fontpicker.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\gbsizer.h"/>\r
+                               RelativePath="..\..\include\wx\fontutil.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\gdicmn.h"/>\r
+                               RelativePath="..\..\include\wx\frame.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\gdiobj.h"/>\r
+                               RelativePath="..\..\include\wx\aui\framemanager.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\geometry.h"/>\r
+                               RelativePath="..\..\include\wx\gauge.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\gifdecod.h"/>\r
+                               RelativePath="..\..\include\wx\gbsizer.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\glcanvas.h"/>\r
+                               RelativePath="..\..\include\wx\gdicmn.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\graphics.h"/>\r
+                               RelativePath="..\..\include\wx\gdiobj.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\grid.h"/>\r
+                               RelativePath="..\..\include\wx\geometry.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\help.h"/>\r
+                               RelativePath="..\..\include\wx\gifdecod.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\helpbase.h"/>\r
+                               RelativePath="..\..\include\wx\glcanvas.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\helphtml.h"/>\r
+                               RelativePath="..\..\include\wx\graphics.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\helpwin.h"/>\r
+                               RelativePath="..\..\include\wx\grid.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\htmllbox.h"/>\r
+                               RelativePath="..\..\include\wx\headercol.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\hyperlink.h"/>\r
+                               RelativePath="..\..\include\wx\headerctrl.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\icon.h"/>\r
+                               RelativePath="..\..\include\wx\help.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\iconbndl.h"/>\r
+                               RelativePath="..\..\include\wx\helpbase.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\imagbmp.h"/>\r
+                               RelativePath="..\..\include\wx\helphtml.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\image.h"/>\r
+                               RelativePath="..\..\include\wx\helpwin.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\imaggif.h"/>\r
+                               RelativePath="..\..\include\wx\htmllbox.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\imagiff.h"/>\r
+                               RelativePath="..\..\include\wx\hyperlink.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\imagjpeg.h"/>\r
+                               RelativePath="..\..\include\wx\icon.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\imaglist.h"/>\r
+                               RelativePath="..\..\include\wx\iconbndl.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\imagpcx.h"/>\r
+                               RelativePath="..\..\include\wx\imagbmp.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\imagpng.h"/>\r
+                               RelativePath="..\..\include\wx\image.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\imagpnm.h"/>\r
+                               RelativePath="..\..\include\wx\imaggif.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\imagtga.h"/>\r
+                               RelativePath="..\..\include\wx\imagiff.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\imagtiff.h"/>\r
+                               RelativePath="..\..\include\wx\imagjpeg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\imagxpm.h"/>\r
+                               RelativePath="..\..\include\wx\imaglist.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\joystick.h"/>\r
+                               RelativePath="..\..\include\wx\imagpcx.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\layout.h"/>\r
+                               RelativePath="..\..\include\wx\imagpng.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\laywin.h"/>\r
+                               RelativePath="..\..\include\wx\imagpnm.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\listbase.h"/>\r
+                               RelativePath="..\..\include\wx\imagtga.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\listbook.h"/>\r
+                               RelativePath="..\..\include\wx\imagtiff.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\listbox.h"/>\r
+                               RelativePath="..\..\include\wx\imagxpm.h">\r
+                       </File>\r

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\matrix.h"/>\r
+                               RelativePath="..\..\include\wx\layout.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\mdi.h"/>\r
+                               RelativePath="..\..\include\wx\laywin.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\mediactrl.h"/>\r
+                               RelativePath="..\..\include\wx\listbase.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\menu.h"/>\r
+                               RelativePath="..\..\include\wx\listbook.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\menuitem.h"/>\r
+                               RelativePath="..\..\include\wx\listbox.h">\r
+                       </File>\r

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\minifram.h"/>\r
+                               RelativePath="..\..\include\wx\propgrid\manager.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msgdlg.h"/>\r
+                               RelativePath="..\..\include\wx\matrix.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\nativewin.h"/>\r
+                               RelativePath="..\..\include\wx\mdi.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\nonownedwnd.h"/>\r
+                               RelativePath="..\..\include\wx\mediactrl.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\notebook.h"/>\r
+                               RelativePath="..\..\include\wx\menu.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\notifmsg.h"/>\r
+                               RelativePath="..\..\include\wx\menuitem.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\numdlg.h"/>\r
+                               RelativePath="..\..\include\wx\metafile.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\odcombo.h"/>\r
+                               RelativePath="..\..\include\wx\minifram.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\overlay.h"/>\r
+                               RelativePath="..\..\include\wx\msgdlg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\ownerdrw.h"/>\r
+                               RelativePath="..\..\include\wx\nativewin.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\palette.h"/>\r
+                               RelativePath="..\..\include\wx\nonownedwnd.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\panel.h"/>\r
+                               RelativePath="..\..\include\wx\notebook.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\paper.h"/>\r
+                               RelativePath="..\..\include\wx\notifmsg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\pen.h"/>\r
+                               RelativePath="..\..\include\wx\numdlg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\pickerbase.h"/>\r
+                               RelativePath="..\..\include\wx\odcombo.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\popupwin.h"/>\r
+                               RelativePath="..\..\include\wx\overlay.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\position.h"/>\r
+                               RelativePath="..\..\include\wx\ownerdrw.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\print.h"/>\r
+                               RelativePath="..\..\include\wx\palette.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\printdlg.h"/>\r
+                               RelativePath="..\..\include\wx\panel.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\prntbase.h"/>\r
+                               RelativePath="..\..\include\wx\paper.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\progdlg.h"/>\r
+                               RelativePath="..\..\include\wx\pen.h">\r
+                       </File>\r

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\quantize.h"/>\r
+                               RelativePath="..\..\include\wx\pickerbase.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\radiobox.h"/>\r
+                               RelativePath="..\..\include\wx\popupwin.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\radiobut.h"/>\r
+                               RelativePath="..\..\include\wx\position.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\rawbmp.h"/>\r
+                               RelativePath="..\..\include\wx\print.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\region.h"/>\r
+                               RelativePath="..\..\include\wx\printdlg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\renderer.h"/>\r
+                               RelativePath="..\..\include\wx\prntbase.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\richtext\richtextbuffer.h"/>\r
+                               RelativePath="..\..\include\wx\progdlg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\richtext\richtextctrl.h"/>\r
+                               RelativePath="..\..\include\wx\propdlg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\richtext\richtextformatdlg.h"/>\r
+                               RelativePath="..\..\include\wx\propgrid\property.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\richtext\richtexthtml.h"/>\r
+                               RelativePath="..\..\include\wx\propgrid\propgrid.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\richtext\richtextprint.h"/>\r
+                               RelativePath="..\..\include\wx\propgrid\propgriddefs.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\richtext\richtextstyledlg.h"/>\r
+                               RelativePath="..\..\include\wx\propgrid\propgridiface.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\richtext\richtextstyles.h"/>\r
+                               RelativePath="..\..\include\wx\propgrid\propgridpagestate.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\richtext\richtextsymboldlg.h"/>\r
+                               RelativePath="..\..\include\wx\propgrid\props.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\richtext\richtextxml.h"/>\r
+                               RelativePath="..\..\include\wx\quantize.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\sashwin.h"/>\r
+                               RelativePath="..\..\include\wx\radiobox.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\scopeguard.h"/>\r
+                               RelativePath="..\..\include\wx\radiobut.h">\r
+                       </File>\r

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\scrolwin.h"/>\r
+                               RelativePath="..\..\include\wx\rearrangectrl.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\selstore.h"/>\r
+                               RelativePath="..\..\include\wx\region.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\settings.h"/>\r
+                               RelativePath="..\..\include\wx\renderer.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\sizer.h"/>\r
+                               RelativePath="..\..\include\wx\richtext\richtextbuffer.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\slider.h"/>\r
+                               RelativePath="..\..\include\wx\richtext\richtextctrl.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\sound.h"/>\r
+                               RelativePath="..\..\include\wx\richtext\richtextformatdlg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\spinbutt.h"/>\r
+                               RelativePath="..\..\include\wx\richtext\richtexthtml.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\spinctrl.h"/>\r
+                               RelativePath="..\..\include\wx\richtext\richtextprint.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\splash.h"/>\r
+                               RelativePath="..\..\include\wx\richtext\richtextstyledlg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\splitter.h"/>\r
+                               RelativePath="..\..\include\wx\richtext\richtextstyles.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\srchctrl.h"/>\r
+                               RelativePath="..\..\include\wx\richtext\richtextsymboldlg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\statbmp.h"/>\r
+                               RelativePath="..\..\include\wx\richtext\richtextxml.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\statbox.h"/>\r
+                               RelativePath="..\..\include\wx\sashwin.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\statline.h"/>\r
+                               RelativePath="..\..\include\wx\scopeguard.h">\r
+                       </File>\r

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\statusbr.h"/>\r
+                               RelativePath="..\..\include\wx\scrolwin.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\stc\stc.h"/>\r
+                               RelativePath="..\..\include\wx\selstore.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\tab.h"/>\r
+                               RelativePath="..\..\include\wx\settings.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\tabctrl.h"/>\r
+                               RelativePath="..\..\include\wx\sizer.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\aui\tabmdi.h"/>\r
+                               RelativePath="..\..\include\wx\slider.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\taskbar.h"/>\r
+                               RelativePath="..\..\include\wx\sound.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\tbarbase.h"/>\r
+                               RelativePath="..\..\include\wx\spinbutt.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\textctrl.h"/>\r
+                               RelativePath="..\..\include\wx\spinctrl.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\textdlg.h"/>\r
+                               RelativePath="..\..\include\wx\splash.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\textentry.h"/>\r
+                               RelativePath="..\..\include\wx\splitter.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\tglbtn.h"/>\r
+                               RelativePath="..\..\include\wx\srchctrl.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\tipdlg.h"/>\r
+                               RelativePath="..\..\include\wx\statbmp.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\tipwin.h"/>\r
+                               RelativePath="..\..\include\wx\statbox.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\toolbar.h"/>\r
+                               RelativePath="..\..\include\wx\statline.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\toolbook.h"/>\r
+                               RelativePath="..\..\include\wx\stattext.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\tooltip.h"/>\r
+                               RelativePath="..\..\include\wx\statusbr.h">\r
+                       </File>\r

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\treebase.h"/>\r
+                               RelativePath="..\..\include\wx\aui\tabmdi.h">\r
+                       </File>\r

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\treectrl.h"/>\r
+                               RelativePath="..\..\include\wx\tbarbase.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\valgen.h"/>\r
+                               RelativePath="..\..\include\wx\textctrl.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\validate.h"/>\r
+                               RelativePath="..\..\include\wx\textdlg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\valtext.h"/>\r
+                               RelativePath="..\..\include\wx\textentry.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\vidmode.h"/>\r
+                               RelativePath="..\..\include\wx\tglbtn.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\vlbox.h"/>\r
+                               RelativePath="..\..\include\wx\tipdlg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\vms_x_fix.h"/>\r
+                               RelativePath="..\..\include\wx\tipwin.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\vscroll.h"/>\r
+                               RelativePath="..\..\include\wx\toolbar.h">\r
+                       </File>\r

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\wxhtml.h"/>\r
+                               RelativePath="..\..\include\wx\treebase.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_all.h"/>\r
+                               RelativePath="..\..\include\wx\treebook.h">\r
+                       </File>\r

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_bmp.h"/>\r
+                               RelativePath="..\..\include\wx\treectrl.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_bmpbt.h"/>\r
+                               RelativePath="..\..\include\wx\valgen.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_bmpcbox.h"/>\r
+                               RelativePath="..\..\include\wx\validate.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_bttn.h"/>\r
+                               RelativePath="..\..\include\wx\valtext.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_cald.h"/>\r
+                               RelativePath="..\..\include\wx\vidmode.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_chckb.h"/>\r
+                               RelativePath="..\..\include\wx\vlbox.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_chckl.h"/>\r
+                               RelativePath="..\..\include\wx\vms_x_fix.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_choic.h"/>\r
+                               RelativePath="..\..\include\wx\vscroll.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_choicbk.h"/>\r
+                               RelativePath="..\..\include\wx\window.h">\r
+                       </File>\r

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_collpane.h"/>\r
+                               RelativePath="..\..\include\wx\windowid.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_combo.h"/>\r
+                               RelativePath="..\..\include\wx\wizard.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_datectrl.h"/>\r
+                               RelativePath="..\..\include\wx\wrapsizer.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_dirpicker.h"/>\r
+                               RelativePath="..\..\include\wx\wupdlock.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_dlg.h"/>\r
+                               RelativePath="..\..\include\wx\wxhtml.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_filepicker.h"/>\r
+                               RelativePath="..\..\include\wx\xrc\xh_all.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_fontpicker.h"/>\r
+                               RelativePath="..\..\include\wx\xrc\xh_animatctrl.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_frame.h"/>\r
+                               RelativePath="..\..\include\wx\xrc\xh_bmp.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_gauge.h"/>\r
+                               RelativePath="..\..\include\wx\xrc\xh_bmpbt.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_gdctl.h"/>\r
+                               RelativePath="..\..\include\wx\xrc\xh_bmpcbox.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_grid.h"/>\r
+                               RelativePath="..\..\include\wx\xrc\xh_bttn.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_html.h"/>\r
+                               RelativePath="..\..\include\wx\xrc\xh_cald.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_htmllbox.h"/>\r
+                               RelativePath="..\..\include\wx\xrc\xh_chckb.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_hyperlink.h"/>\r
+                               RelativePath="..\..\include\wx\xrc\xh_chckl.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_listb.h"/>\r
+                               RelativePath="..\..\include\wx\xrc\xh_choic.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_listbk.h"/>\r
+                               RelativePath="..\..\include\wx\xrc\xh_choicbk.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_listc.h"/>\r
+                               RelativePath="..\..\include\wx\xrc\xh_clrpicker.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_mdi.h"/>\r
+                               RelativePath="..\..\include\wx\xrc\xh_collpane.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_combo.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_menu.h"/>\r
+                               RelativePath="..\..\include\wx\xrc\xh_comboctrl.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_notbk.h"/>\r
+                               RelativePath="..\..\include\wx\xrc\xh_datectrl.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_odcombo.h"/>\r
+                               RelativePath="..\..\include\wx\xrc\xh_dirpicker.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_panel.h"/>\r
+                               RelativePath="..\..\include\wx\xrc\xh_dlg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_propdlg.h"/>\r
+                               RelativePath="..\..\include\wx\xrc\xh_filepicker.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_radbt.h"/>\r
+                               RelativePath="..\..\include\wx\xrc\xh_fontpicker.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_radbx.h"/>\r
+                               RelativePath="..\..\include\wx\xrc\xh_frame.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_scrol.h"/>\r
+                               RelativePath="..\..\include\wx\xrc\xh_gauge.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_scwin.h"/>\r
+                               RelativePath="..\..\include\wx\xrc\xh_gdctl.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_sizer.h"/>\r
+                               RelativePath="..\..\include\wx\xrc\xh_grid.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_slidr.h"/>\r
+                               RelativePath="..\..\include\wx\xrc\xh_html.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_spin.h"/>\r
+                               RelativePath="..\..\include\wx\xrc\xh_htmllbox.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_split.h"/>\r
+                               RelativePath="..\..\include\wx\xrc\xh_hyperlink.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_srchctrl.h"/>\r
+                               RelativePath="..\..\include\wx\xrc\xh_listb.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_statbar.h"/>\r
+                               RelativePath="..\..\include\wx\xrc\xh_listbk.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_stbmp.h"/>\r
+                               RelativePath="..\..\include\wx\xrc\xh_listc.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_stbox.h"/>\r
+                               RelativePath="..\..\include\wx\xrc\xh_mdi.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_stlin.h"/>\r
+                               RelativePath="..\..\include\wx\xrc\xh_menu.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_sttxt.h"/>\r
+                               RelativePath="..\..\include\wx\xrc\xh_notbk.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_text.h"/>\r
+                               RelativePath="..\..\include\wx\xrc\xh_odcombo.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_tglbtn.h"/>\r
+                               RelativePath="..\..\include\wx\xrc\xh_panel.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_toolb.h"/>\r
+                               RelativePath="..\..\include\wx\xrc\xh_propdlg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_treebk.h"/>\r
+                               RelativePath="..\..\include\wx\xrc\xh_radbx.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_unkwn.h"/>\r
+                               RelativePath="..\..\include\wx\xrc\xh_scrol.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xh_wizrd.h"/>\r
+                               RelativePath="..\..\include\wx\xrc\xh_scwin.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xrc\xmlres.h"/>\r
+                               RelativePath="..\..\include\wx\xrc\xh_sizer.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xpmdecod.h"/>\r
+                               RelativePath="..\..\include\wx\xrc\xh_slidr.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xpmhand.h"/>\r
+                               RelativePath="..\..\include\wx\xrc\xh_spin.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_split.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_srchctrl.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_statbar.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_stbmp.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_stbox.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_stlin.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_sttxt.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_text.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_tglbtn.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_toolb.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_tree.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_treebk.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_unkwn.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_wizrd.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xmlres.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xpmdecod.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xpmhand.h">\r
+                       </File>\r

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