supporting alignment in single line controls, see #14452

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

diff --git a/build/msw/wx_vc7_adv.vcproj b/build/msw/wx_vc7_adv.vcproj
index 2ac911bd0797cf732b67fafb762e5cc09164f503..38890a59d8b04c3f56b3eb495186a7591145e5ce 100644 (file)
--- a/build/msw/wx_vc7_adv.vcproj
+++ b/build/msw/wx_vc7_adv.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>\r
+<?xml version="1.0" encoding="Windows-1252"?>\r

 <!--\r
 \r
 <!--\r
 \r

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

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


@@ -17,226 +17,238 @@
        </Platforms>\r
        <Configurations>\r
                <Configuration\r
        </Platforms>\r
        <Configurations>\r
                <Configuration\r

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

                        UseOfMFC="0"\r
                        UseOfMFC="0"\r

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

                        CharacterSet="1">\r
                        <Tool\r
                        CharacterSet="1">\r
                        <Tool\r

-                               Name="VCPreBuildEventTool"/>\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
+                               UsePrecompiledHeader="3"\r
+                               PrecompiledHeaderThrough="wx/wxprec.h"\r
+                               PrecompiledHeaderFile="vc_mswud\wxprec_advlib.pch"\r
+                               ObjectFile="vc_mswud\adv\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_adv.pdb"\r
+                               WarningLevel="4"\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r

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

-                               Name="VCXMLDataGeneratorTool"/>\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxmsw29ud_adv.lib"\r
+                               SuppressStartupBanner="TRUE"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"/>\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r

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

-                               Name="VCIDLTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"/>\r
+                       <Tool\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswu\adv"\r
+                       ConfigurationType="4"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
+                       CharacterSet="1">\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
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING"\r
+                               ExceptionHandling="TRUE"\r

                                RuntimeLibrary="2"\r
                                RuntimeLibrary="2"\r

-                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeTypeInfo="TRUE"\r

                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r

-                               PrecompiledHeaderFile="vc_mswunivudll\wxprec_advdll.pch"\r
-                               AssemblerListingLocation="vc_mswunivudll\adv\"\r
-                               ObjectFile="vc_mswunivudll\adv\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290u_adv_vc_custom.pdb"\r
+                               PrecompiledHeaderFile="vc_mswu\wxprec_advlib.pch"\r
+                               ObjectFile="vc_mswu\adv\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_adv.pdb"\r

                                WarningLevel="4"\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_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_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"/>\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxmsw29u_adv.lib"\r
+                               SuppressStartupBanner="TRUE"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r

                        <Tool\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCPreLinkEventTool"/>\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\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               AdditionalOptions=""\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv290u_adv_vc_custom.dll"\r
-                               LinkIncremental="2"\r
-                               ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_adv.lib"\r
-                               SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290u_adv_vc_custom.pdb"\r
-                               TargetMachine="1"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING"\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_dll\wx_vc7_adv.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
                </Configuration>\r
                <Configuration\r

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

                        UseOfMFC="0"\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
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\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
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r

-                               PrecompiledHeaderFile="vc_mswunivuddll\wxprec_advdll.pch"\r
-                               AssemblerListingLocation="vc_mswunivuddll\adv\"\r
-                               ObjectFile="vc_mswunivuddll\adv\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290ud_adv_vc_custom.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivud\wxprec_advlib.pch"\r
+                               ObjectFile="vc_mswunivud\adv\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_adv.pdb"\r

                                WarningLevel="4"\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_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_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"/>\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_adv.lib"\r
+                               SuppressStartupBanner="TRUE"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r

                        <Tool\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCPreLinkEventTool"/>\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\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               AdditionalOptions=""\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_adv_vc_custom.dll"\r
-                               LinkIncremental="2"\r
-                               ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_adv.lib"\r
-                               SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290ud_adv_vc_custom.pdb"\r
-                               TargetMachine="1"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\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_dll\wx_vc7_adv.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
                </Configuration>\r
                <Configuration\r

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

                        UseOfMFC="0"\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
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING"\r
+                               ExceptionHandling="TRUE"\r

                                RuntimeLibrary="2"\r
                                RuntimeLibrary="2"\r

-                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeTypeInfo="TRUE"\r

                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r

-                               PrecompiledHeaderFile="vc_mswudll\wxprec_advdll.pch"\r
-                               AssemblerListingLocation="vc_mswudll\adv\"\r
-                               ObjectFile="vc_mswudll\adv\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290u_adv_vc_custom.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivu\wxprec_advlib.pch"\r
+                               ObjectFile="vc_mswunivu\adv\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_adv.pdb"\r

                                WarningLevel="4"\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_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"/>\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxmswuniv29u_adv.lib"\r
+                               SuppressStartupBanner="TRUE"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r

                        <Tool\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCPreLinkEventTool"/>\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\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               AdditionalOptions=""\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw290u_adv_vc_custom.dll"\r
-                               LinkIncremental="2"\r
-                               ImportLibrary="..\..\lib\vc_dll\wxmsw29u_adv.lib"\r
-                               SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290u_adv_vc_custom.pdb"\r
-                               TargetMachine="1"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING"\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_dll\wx_vc7_adv.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="DLL Debug|Win32"\r
                </Configuration>\r
                <Configuration\r
                        Name="DLL Debug|Win32"\r


@@ -244,337 +256,269 @@
                        IntermediateDirectory="vc_mswuddll\adv"\r
                        ConfigurationType="2"\r
                        UseOfMFC="0"\r
                        IntermediateDirectory="vc_mswuddll\adv"\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_ADV"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\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_advdll.pch"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_advdll.pch"\r

-                               AssemblerListingLocation="vc_mswuddll\adv\"\r

                                ObjectFile="vc_mswuddll\adv\"\r
                                ObjectFile="vc_mswuddll\adv\"\r

-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290ud_adv_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294ud_adv_vc_custom.pdb"\r

                                WarningLevel="4"\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_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"/>\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\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r

                                AdditionalOptions=""\r
                                AdditionalOptions=""\r

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

                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_adv.lib"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_adv.lib"\r

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

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

-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290ud_adv_vc_custom.pdb"\r
+                               GenerateDebugInformation="TRUE"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294ud_adv_vc_custom.pdb"\r

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

-                               Name="VCALinkTool"/>\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"/>\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_dll\wx_vc7_adv.bsc"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r

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

-               </Configuration>\r
-               <Configuration\r
-                       Name="Universal Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswunivu\adv"\r
-                       ConfigurationType="4"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
-                       CharacterSet="1">\r

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

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

                        <Tool\r
                        <Tool\r

-                               Name="VCXMLDataGeneratorTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\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
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r

-                               Name="VCIDLTool"/>\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
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswudll\adv"\r
+                       ConfigurationType="2"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
+                       CharacterSet="1">\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
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
+                               ExceptionHandling="TRUE"\r

                                RuntimeLibrary="2"\r
                                RuntimeLibrary="2"\r

-                               PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeTypeInfo="TRUE"\r

                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r

-                               PrecompiledHeaderFile="vc_mswunivu\wxprec_advlib.pch"\r
-                               AssemblerListingLocation="vc_mswunivu\adv\"\r
-                               ObjectFile="vc_mswunivu\adv\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_adv.pdb"\r
+                               PrecompiledHeaderFile="vc_mswudll\wxprec_advdll.pch"\r
+                               ObjectFile="vc_mswudll\adv\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294u_adv_vc_custom.pdb"\r

                                WarningLevel="4"\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\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"/>\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294u_adv_vc_custom.dll"\r
+                               LinkIncremental="1"\r
+                               ImportLibrary="..\..\lib\vc_dll\wxmsw29u_adv.lib"\r
+                               SuppressStartupBanner="TRUE"\r
+                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+                               GenerateDebugInformation="TRUE"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294u_adv_vc_custom.pdb"\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               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_adv.lib"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\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="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_adv.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
                </Configuration>\r
                <Configuration\r

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

                        UseOfMFC="0"\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
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\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
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r

-                               PrecompiledHeaderFile="vc_mswunivud\wxprec_advlib.pch"\r
-                               AssemblerListingLocation="vc_mswunivud\adv\"\r
-                               ObjectFile="vc_mswunivud\adv\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_adv.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivuddll\wxprec_advdll.pch"\r
+                               ObjectFile="vc_mswunivuddll\adv\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294ud_adv_vc_custom.pdb"\r

                                WarningLevel="4"\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"/>\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294ud_adv_vc_custom.dll"\r
+                               LinkIncremental="2"\r
+                               ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_adv.lib"\r
+                               SuppressStartupBanner="TRUE"\r
+                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+                               GenerateDebugInformation="TRUE"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294ud_adv_vc_custom.pdb"\r
+                               TargetMachine="1"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               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_adv.lib"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\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
                        <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_adv.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
                </Configuration>\r
                <Configuration\r

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

                        UseOfMFC="0"\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
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
+                               ExceptionHandling="TRUE"\r

                                RuntimeLibrary="2"\r
                                RuntimeLibrary="2"\r

-                               PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeTypeInfo="TRUE"\r

                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r

-                               PrecompiledHeaderFile="vc_mswu\wxprec_advlib.pch"\r
-                               AssemblerListingLocation="vc_mswu\adv\"\r
-                               ObjectFile="vc_mswu\adv\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_adv.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivudll\wxprec_advdll.pch"\r
+                               ObjectFile="vc_mswunivudll\adv\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294u_adv_vc_custom.pdb"\r

                                WarningLevel="4"\r
                                WarningLevel="4"\r

-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\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"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmsw29u_adv.lib"\r
-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCALinkTool"/>\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCCustomBuildTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc7_adv.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294u_adv_vc_custom.dll"\r
+                               LinkIncremental="1"\r
+                               ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_adv.lib"\r
+                               SuppressStartupBanner="TRUE"\r
+                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+                               GenerateDebugInformation="TRUE"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294u_adv_vc_custom.pdb"\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCFxCopTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r

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

-               </Configuration>\r
-               <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswud\adv"\r
-                       ConfigurationType="4"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
-                       CharacterSet="1">\r

                        <Tool\r
                                Name="VCPreBuildEventTool"/>\r
                        <Tool\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
-                               InlineFunctionExpansion="1"\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"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
-                               UsePrecompiledHeader="3"\r
-                               PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswud\wxprec_advlib.pch"\r
-                               AssemblerListingLocation="vc_mswud\adv\"\r
-                               ObjectFile="vc_mswud\adv\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_adv.pdb"\r
-                               WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r

                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\r

                                Culture="1033"\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"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmsw29ud_adv.lib"\r
-                               SuppressStartupBanner="true"/>\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_adv.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,152 +529,322 @@
                        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\animatecmn.cpp"/>\r
+                               RelativePath="..\..\src\common\animatecmn.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\datavcmn.cpp"/>\r
+                               RelativePath="..\..\src\common\bmpcboxcmn.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\calctrlcmn.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\datavcmn.cpp">\r
+                       </File>\r

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

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

                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

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

                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

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

                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

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

                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

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

                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

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

                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

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

                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

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

                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="1"/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="1"/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r

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

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\taskbarcmn.cpp"/>\r
+                               RelativePath="..\..\src\common\odcombocmn.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\richtooltipcmn.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\taskbarcmn.cpp">\r
+                       </File>\r

                </Filter>\r
                <Filter\r
                        Name="MSW Sources"\r
                        UniqueIdentifier="{D030D8C2-53EE-5B96-8F89-D78157B06140}">\r
                        <File\r
                </Filter>\r
                <Filter\r
                        Name="MSW Sources"\r
                        UniqueIdentifier="{D030D8C2-53EE-5B96-8F89-D78157B06140}">\r
                        <File\r

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

                        <File\r
                        <File\r

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

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

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

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

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\commandlinkbutton.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\datecontrols.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\datectrl.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\datetimectrl.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\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="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\hyperlink.cpp">\r

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

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

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

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                                RelativePath="..\..\src\msw\version.rc">\r
                                <FileConfiguration\r
                        <File\r
                                RelativePath="..\..\src\msw\version.rc">\r
                                <FileConfiguration\r

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

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

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

                                <FileConfiguration\r
                                <FileConfiguration\r

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

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

-                               RelativePath="..\..\src\generic\aboutdlgg.cpp"/>\r
+                               RelativePath="..\..\src\generic\aboutdlgg.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\animateg.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\bannerwindow.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\bmpcboxg.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\calctrlg.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\commandlinkbuttong.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\datavgen.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

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

                </Filter>\r
                <Filter\r
                        Name="Setup Headers"\r
                </Filter>\r
                <Filter\r
                        Name="Setup Headers"\r


@@ -738,140 +852,136 @@
                        <File\r
                                RelativePath="..\..\include\wx\msw\setup.h">\r
                                <FileConfiguration\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\setup.h">\r
                                <FileConfiguration\r

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

                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswu\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"\r
-                                               AdditionalDependencies="$(SOURCE) &quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswud\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"/>\r

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

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

                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswud\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"\r
-                                               AdditionalDependencies="$(SOURCE) &quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswu\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"/>\r

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

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

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

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

                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswu\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"\r
-                                               AdditionalDependencies="$(SOURCE) &quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswud\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"/>\r

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

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

                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswud\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"\r
-                                               AdditionalDependencies="$(SOURCE) &quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswu\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"/>\r

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

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

                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\univ\setup.h">\r
                                <FileConfiguration\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\univ\setup.h">\r
                                <FileConfiguration\r

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

                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
-                                               AdditionalDependencies="$(SOURCE) &quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"/>\r

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

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

                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
-                                               AdditionalDependencies="$(SOURCE) &quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"/>\r

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

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

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

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

                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
-                                               AdditionalDependencies="$(SOURCE) &quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"/>\r

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

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

                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
-                                               AdditionalDependencies="$(SOURCE) &quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"/>\r

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

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

                        </File>\r
                </Filter>\r
                <Filter\r
                        Name="MSW Headers"\r
                        UniqueIdentifier="{5AFFF20E-29F9-512B-B80A-7DC45976CDAC}">\r
                        <File\r
                        </File>\r
                </Filter>\r
                <Filter\r
                        Name="MSW Headers"\r
                        UniqueIdentifier="{5AFFF20E-29F9-512B-B80A-7DC45976CDAC}">\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\datectrl.h"/>\r
+                               RelativePath="..\..\include\wx\msw\bmpcbox.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\calctrl.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\commandlinkbutton.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\datectrl.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\datetimectrl.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

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

                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;$(SOURCE)&quot; &quot;..\..\lib\vc_dll\mswunivud\wx\msw&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswud\wx\msw&quot;"/>\r

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

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

                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;$(SOURCE)&quot; &quot;..\..\lib\vc_dll\mswu\wx\msw&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswu\wx\msw&quot;"/>\r

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

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

                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;$(SOURCE)&quot; &quot;..\..\lib\vc_dll\mswud\wx\msw&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivud\wx\msw&quot;"/>\r

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


@@ -880,130 +990,221 @@
                                                Description="Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"\r
                                                CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h&quot;"\r
                                                Outputs="..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"\r
                                                Description="Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"\r
                                                CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h&quot;"\r
                                                Outputs="..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"\r

-                                               AdditionalDependencies="&quot;$(SOURCE)&quot; &quot;..\..\lib\vc_lib\mswunivu\wx\msw&quot;"/>\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivu\wx\msw&quot;"/>\r

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

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

                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;$(SOURCE)&quot; &quot;..\..\lib\vc_lib\mswunivud\wx\msw&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswud\wx\msw&quot;"/>\r

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

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

                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;$(SOURCE)&quot; &quot;..\..\lib\vc_lib\mswu\wx\msw&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswu\wx\msw&quot;"/>\r

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

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

                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;$(SOURCE)&quot; &quot;..\..\lib\vc_lib\mswud\wx\msw&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivud\wx\msw&quot;"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivu\wx\msw&quot;"/>\r

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

-                               RelativePath="..\..\include\wx\msw\joystick.h"/>\r
+                               RelativePath="..\..\include\wx\msw\hyperlink.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\joystick.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\notifmsg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\notifmsg.h"/>\r
+                               RelativePath="..\..\include\wx\msw\sound.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\sound.h"/>\r
+                               RelativePath="..\..\include\wx\msw\taskbar.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\taskbar.h"/>\r
+                               RelativePath="..\..\include\wx\msw\timectrl.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\animate.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\bmpcbox.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\calctrlg.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\dataview.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\animate.h"/>\r
+                               RelativePath="..\..\include\wx\generic\datectrl.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\bmpcbox.h"/>\r
+                               RelativePath="..\..\include\wx\generic\dvrenderer.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\calctrl.h"/>\r
+                               RelativePath="..\..\include\wx\generic\dvrenderers.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\dataview.h"/>\r
+                               RelativePath="..\..\include\wx\generic\grid.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\datectrl.h"/>\r
+                               RelativePath="..\..\include\wx\generic\gridctrl.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\grid.h"/>\r
+                               RelativePath="..\..\include\wx\generic\grideditors.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\gridctrl.h"/>\r
+                               RelativePath="..\..\include\wx\generic\gridsel.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\notifmsg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\notifmsg.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\splash.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\splash.h"/>\r
+                               RelativePath="..\..\include\wx\generic\timectrl.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="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
+                               RelativePath="..\..\include\wx\animate.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\bannerwindow.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\bmpcbox.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\calctrl.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\commandlinkbutton.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\dataview.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\datectrl.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\animate.h"/>\r
+                               RelativePath="..\..\include\wx\dateevt.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\bmpcbox.h"/>\r
+                               RelativePath="..\..\include\wx\datetimectrl.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\calctrl.h"/>\r
+                               RelativePath="..\..\include\wx\dcbuffer.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\dataview.h"/>\r
+                               RelativePath="..\..\include\wx\dvrenderers.h">\r
+                       </File>\r

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\dateevt.h"/>\r
+                               RelativePath="..\..\include\wx\grid.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\dcbuffer.h"/>\r
+                               RelativePath="..\..\include\wx\hyperlink.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\editlbox.h"/>\r
+                               RelativePath="..\..\include\wx\joystick.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\grid.h"/>\r
+                               RelativePath="..\..\include\wx\laywin.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\hyperlink.h"/>\r
+                               RelativePath="..\..\include\wx\notifmsg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\joystick.h"/>\r
+                               RelativePath="..\..\include\wx\odcombo.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\laywin.h"/>\r
+                               RelativePath="..\..\include\wx\propdlg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\notifmsg.h"/>\r
+                               RelativePath="..\..\include\wx\richtooltip.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\odcombo.h"/>\r
+                               RelativePath="..\..\include\wx\sashwin.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\propdlg.h"/>\r
+                               RelativePath="..\..\include\wx\sound.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\sashwin.h"/>\r
+                               RelativePath="..\..\include\wx\splash.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\sound.h"/>\r
+                               RelativePath="..\..\include\wx\taskbar.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\splash.h"/>\r
+                               RelativePath="..\..\include\wx\timectrl.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\taskbar.h"/>\r
+                               RelativePath="..\..\include\wx\tipdlg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\tipdlg.h"/>\r
+                               RelativePath="..\..\include\wx\treelist.h">\r
+                       </File>\r

                        <File\r
                        <File\r

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

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