insert missing iclude file

[wxWidgets.git] / tests / test_vc7_test_gui.vcproj

diff --git a/tests/test_vc7_test_gui.vcproj b/tests/test_vc7_test_gui.vcproj
index 43431002384440458081a2af241c05b4abf8ae92..d7a2de9d87c20793e7c958c52e2e0deffcbcffb3 100644 (file)
--- a/tests/test_vc7_test_gui.vcproj
+++ b/tests/test_vc7_test_gui.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>\r
+<?xml version="1.0" encoding="Windows-1252"?>\r

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

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

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


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

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

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

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

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

-                               InlineFunctionExpansion="1"\r

                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"\r

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

                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r

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

                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\testprec_test_gui.pch"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\testprec_test_gui.pch"\r


@@ -55,44 +39,46 @@
                                ObjectFile="vc_mswunivudll\test_gui\"\r
                                ProgramDataBaseFileName="vc_mswunivudll\test_gui.pdb"\r
                                WarningLevel="4"\r
                                ObjectFile="vc_mswunivudll\test_gui\"\r
                                ProgramDataBaseFileName="vc_mswunivudll\test_gui.pdb"\r
                                WarningLevel="4"\r

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

                        <Tool\r
                        <Tool\r

-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r

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

-                               AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   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"\r

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

+                               AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   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"\r

                                OutputFile="vc_mswunivudll\test_gui.exe"\r
                                LinkIncremental="2"\r
                                OutputFile="vc_mswunivudll\test_gui.exe"\r
                                LinkIncremental="2"\r

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

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

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

                                ProgramDatabaseFile="vc_mswunivudll\test_gui.pdb"\r
                                ProgramDatabaseFile="vc_mswunivudll\test_gui.pdb"\r

+                               SubSystem="1"\r

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

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

                        <Tool\r
                        <Tool\r

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

                        <Tool\r
                        <Tool\r

-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivudll\test_vc7_test_gui.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"/>\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"/>\r

                        <Tool\r
                        <Tool\r

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

                        <Tool\r
                        <Tool\r

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

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

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

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


@@ -100,32 +86,19 @@
                        IntermediateDirectory="vc_mswunivuddll\test_gui"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        IntermediateDirectory="vc_mswunivuddll\test_gui"\r
                        ConfigurationType="1"\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;.;.\..\samples"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"\r

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

                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\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="testprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\testprec_test_gui.pch"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\testprec_test_gui.pch"\r


@@ -133,44 +106,46 @@
                                ObjectFile="vc_mswunivuddll\test_gui\"\r
                                ProgramDataBaseFileName="vc_mswunivuddll\test_gui.pdb"\r
                                WarningLevel="4"\r
                                ObjectFile="vc_mswunivuddll\test_gui\"\r
                                ProgramDataBaseFileName="vc_mswunivuddll\test_gui.pdb"\r
                                WarningLevel="4"\r

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

                        <Tool\r
                        <Tool\r

-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r

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

-                               AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r

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

+                               AdditionalDependencies="wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   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"\r

                                OutputFile="vc_mswunivuddll\test_gui.exe"\r
                                LinkIncremental="2"\r
                                OutputFile="vc_mswunivuddll\test_gui.exe"\r
                                LinkIncremental="2"\r

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

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

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

                                ProgramDatabaseFile="vc_mswunivuddll\test_gui.pdb"\r
                                ProgramDatabaseFile="vc_mswunivuddll\test_gui.pdb"\r

+                               SubSystem="1"\r

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

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

                        <Tool\r
                        <Tool\r

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

                        <Tool\r
                        <Tool\r

-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivuddll\test_vc7_test_gui.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCFxCopTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

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

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

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

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


@@ -178,32 +153,16 @@
                        IntermediateDirectory="vc_mswudll\test_gui"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        IntermediateDirectory="vc_mswudll\test_gui"\r
                        ConfigurationType="1"\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;.;.\..\samples"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"\r

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

                                PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r

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

                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\testprec_test_gui.pch"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\testprec_test_gui.pch"\r


@@ -211,44 +170,46 @@
                                ObjectFile="vc_mswudll\test_gui\"\r
                                ProgramDataBaseFileName="vc_mswudll\test_gui.pdb"\r
                                WarningLevel="4"\r
                                ObjectFile="vc_mswudll\test_gui\"\r
                                ProgramDataBaseFileName="vc_mswudll\test_gui.pdb"\r
                                WarningLevel="4"\r

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

                        <Tool\r
                        <Tool\r

-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r

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

-                               AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   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"\r

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

+                               AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   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"\r

                                OutputFile="vc_mswudll\test_gui.exe"\r
                                LinkIncremental="2"\r
                                OutputFile="vc_mswudll\test_gui.exe"\r
                                LinkIncremental="2"\r

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

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

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

                                ProgramDatabaseFile="vc_mswudll\test_gui.pdb"\r
                                ProgramDatabaseFile="vc_mswudll\test_gui.pdb"\r

+                               SubSystem="1"\r

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

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

                        <Tool\r
                        <Tool\r

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

                        <Tool\r
                        <Tool\r

-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswudll\test_vc7_test_gui.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

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

                        <Tool\r
                        <Tool\r

-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r

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

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

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


@@ -256,32 +217,19 @@
                        IntermediateDirectory="vc_mswuddll\test_gui"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        IntermediateDirectory="vc_mswuddll\test_gui"\r
                        ConfigurationType="1"\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;.;.\..\samples"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"\r

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

                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\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="testprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\testprec_test_gui.pch"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\testprec_test_gui.pch"\r


@@ -289,44 +237,46 @@
                                ObjectFile="vc_mswuddll\test_gui\"\r
                                ProgramDataBaseFileName="vc_mswuddll\test_gui.pdb"\r
                                WarningLevel="4"\r
                                ObjectFile="vc_mswuddll\test_gui\"\r
                                ProgramDataBaseFileName="vc_mswuddll\test_gui.pdb"\r
                                WarningLevel="4"\r

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

                        <Tool\r
                        <Tool\r

-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r

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

-                               AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   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"\r

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

+                               AdditionalDependencies="wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   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"\r

                                OutputFile="vc_mswuddll\test_gui.exe"\r
                                LinkIncremental="2"\r
                                OutputFile="vc_mswuddll\test_gui.exe"\r
                                LinkIncremental="2"\r

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

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

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

                                ProgramDatabaseFile="vc_mswuddll\test_gui.pdb"\r
                                ProgramDatabaseFile="vc_mswuddll\test_gui.pdb"\r

+                               SubSystem="1"\r

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

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

                        <Tool\r
                        <Tool\r

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

                        <Tool\r
                        <Tool\r

-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswuddll\test_vc7_test_gui.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"/>\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"/>\r

                        <Tool\r
                        <Tool\r

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

                        <Tool\r
                        <Tool\r

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

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

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

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


@@ -334,32 +284,16 @@
                        IntermediateDirectory="vc_mswunivu\test_gui"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        IntermediateDirectory="vc_mswunivu\test_gui"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r

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

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

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

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

-                               InlineFunctionExpansion="1"\r

                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"\r

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

                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r

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

                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivu\testprec_test_gui.pch"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivu\testprec_test_gui.pch"\r


@@ -367,44 +301,46 @@
                                ObjectFile="vc_mswunivu\test_gui\"\r
                                ProgramDataBaseFileName="vc_mswunivu\test_gui.pdb"\r
                                WarningLevel="4"\r
                                ObjectFile="vc_mswunivu\test_gui\"\r
                                ProgramDataBaseFileName="vc_mswunivu\test_gui.pdb"\r
                                WarningLevel="4"\r

-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"/>\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="wxmswuniv29u_core.lib  wxbase29u.lib   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"\r

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

+                               AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   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"\r

                                OutputFile="vc_mswunivu\test_gui.exe"\r
                                LinkIncremental="2"\r
                                OutputFile="vc_mswunivu\test_gui.exe"\r
                                LinkIncremental="2"\r

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

                                AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_lib"\r

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

                                ProgramDatabaseFile="vc_mswunivu\test_gui.pdb"\r
                                ProgramDatabaseFile="vc_mswunivu\test_gui.pdb"\r

+                               SubSystem="1"\r

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

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

                        <Tool\r
                        <Tool\r

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

                        <Tool\r
                        <Tool\r

-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivu\test_vc7_test_gui.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

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

                        <Tool\r
                        <Tool\r

-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r

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

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

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


@@ -412,32 +348,19 @@
                        IntermediateDirectory="vc_mswunivud\test_gui"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        IntermediateDirectory="vc_mswunivud\test_gui"\r
                        ConfigurationType="1"\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;.;.\..\samples"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"\r

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

                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\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="testprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivud\testprec_test_gui.pch"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivud\testprec_test_gui.pch"\r


@@ -445,44 +368,46 @@
                                ObjectFile="vc_mswunivud\test_gui\"\r
                                ProgramDataBaseFileName="vc_mswunivud\test_gui.pdb"\r
                                WarningLevel="4"\r
                                ObjectFile="vc_mswunivud\test_gui\"\r
                                ProgramDataBaseFileName="vc_mswunivud\test_gui.pdb"\r
                                WarningLevel="4"\r

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

                        <Tool\r
                        <Tool\r

-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r

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

-                               AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   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"\r

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

+                               AdditionalDependencies="wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   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"\r

                                OutputFile="vc_mswunivud\test_gui.exe"\r
                                LinkIncremental="2"\r
                                OutputFile="vc_mswunivud\test_gui.exe"\r
                                LinkIncremental="2"\r

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

                                AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_lib"\r

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

                                ProgramDatabaseFile="vc_mswunivud\test_gui.pdb"\r
                                ProgramDatabaseFile="vc_mswunivud\test_gui.pdb"\r

+                               SubSystem="1"\r

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

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

                        <Tool\r
                        <Tool\r

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

                        <Tool\r
                        <Tool\r

-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivud\test_vc7_test_gui.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"/>\r

                        <Tool\r
                        <Tool\r

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

                        <Tool\r
                        <Tool\r

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

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

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

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


@@ -490,32 +415,16 @@
                        IntermediateDirectory="vc_mswu\test_gui"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        IntermediateDirectory="vc_mswu\test_gui"\r
                        ConfigurationType="1"\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;.;.\..\samples"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"\r

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

                                PreprocessorDefinitions="__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r
                                PreprocessorDefinitions="__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r

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

                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                PrecompiledHeaderFile="vc_mswu\testprec_test_gui.pch"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                PrecompiledHeaderFile="vc_mswu\testprec_test_gui.pch"\r


@@ -523,44 +432,46 @@
                                ObjectFile="vc_mswu\test_gui\"\r
                                ProgramDataBaseFileName="vc_mswu\test_gui.pdb"\r
                                WarningLevel="4"\r
                                ObjectFile="vc_mswu\test_gui\"\r
                                ProgramDataBaseFileName="vc_mswu\test_gui.pdb"\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;.;.\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;NOPCH;_CONSOLE"/>\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="wxmsw29u_core.lib  wxbase29u.lib   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"\r

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

+                               AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   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"\r

                                OutputFile="vc_mswu\test_gui.exe"\r
                                LinkIncremental="2"\r
                                OutputFile="vc_mswu\test_gui.exe"\r
                                LinkIncremental="2"\r

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

                                AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_lib"\r

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

                                ProgramDatabaseFile="vc_mswu\test_gui.pdb"\r
                                ProgramDatabaseFile="vc_mswu\test_gui.pdb"\r

+                               SubSystem="1"\r

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

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

                        <Tool\r
                        <Tool\r

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

                        <Tool\r
                        <Tool\r

-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswu\test_vc7_test_gui.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

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

                        <Tool\r
                        <Tool\r

-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r

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

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

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


@@ -568,32 +479,19 @@
                        IntermediateDirectory="vc_mswud\test_gui"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        IntermediateDirectory="vc_mswud\test_gui"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r

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

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

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

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

-                               InlineFunctionExpansion="1"\r

                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"\r

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

                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\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="testprec.h"\r
                                PrecompiledHeaderFile="vc_mswud\testprec_test_gui.pch"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                PrecompiledHeaderFile="vc_mswud\testprec_test_gui.pch"\r


@@ -601,44 +499,46 @@
                                ObjectFile="vc_mswud\test_gui\"\r
                                ProgramDataBaseFileName="vc_mswud\test_gui.pdb"\r
                                WarningLevel="4"\r
                                ObjectFile="vc_mswud\test_gui\"\r
                                ProgramDataBaseFileName="vc_mswud\test_gui.pdb"\r
                                WarningLevel="4"\r

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

                        <Tool\r
                        <Tool\r

-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r

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

-                               AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   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"\r

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

+                               AdditionalDependencies="wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   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"\r

                                OutputFile="vc_mswud\test_gui.exe"\r
                                LinkIncremental="2"\r
                                OutputFile="vc_mswud\test_gui.exe"\r
                                LinkIncremental="2"\r

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

                                AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_lib"\r

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

                                ProgramDatabaseFile="vc_mswud\test_gui.pdb"\r
                                ProgramDatabaseFile="vc_mswud\test_gui.pdb"\r

+                               SubSystem="1"\r

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

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

                        <Tool\r
                        <Tool\r

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

                        <Tool\r
                        <Tool\r

-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswud\test_vc7_test_gui.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCFxCopTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

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

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

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

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


@@ -647,12 +547,17 @@
        <Files>\r
                <Filter\r
                        Name="Source Files"\r
        <Files>\r
                <Filter\r
                        Name="Source Files"\r

-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">\r

                        <File\r
                        <File\r

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

                        <File\r
                        <File\r

-                               RelativePath=".\config\config.cpp"/>\r
+                               RelativePath=".\controls\comboboxtest.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\config\config.cpp">\r
+                       </File>\r

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


@@ -705,30 +610,55 @@
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r

-                               RelativePath=".\geometry\point.cpp"/>\r
+                               RelativePath=".\misc\guifuncs.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\controls\headerctrltest.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\html\htmlwindow.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\controls\listctrltest.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\geometry\point.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\image\rawbmp.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\image\rawbmp.cpp"/>\r
+                               RelativePath=".\geometry\rect.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\geometry\rect.cpp"/>\r
+                               RelativePath=".\misc\selstoretest.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\misc\selstoretest.cpp"/>\r
+                               RelativePath=".\window\setsize.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\window\setsize.cpp"/>\r
+                               RelativePath=".\geometry\size.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\geometry\size.cpp"/>\r
+                               RelativePath=".\net\socket.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\test.cpp"/>\r
+                               RelativePath=".\test.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\controls\textctrltest.cpp"/>\r
+                               RelativePath=".\controls\textctrltest.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\controls\textentrytest.cpp"/>\r
+                               RelativePath=".\controls\textentrytest.cpp">\r
+                       </File>\r

                </Filter>\r
                <Filter\r
                        Name="Resource Files"\r
                </Filter>\r
                <Filter\r
                        Name="Resource Files"\r

-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r

                        <File\r
                        <File\r

-                               RelativePath=".\..\samples\sample.rc"/>\r
+                               RelativePath=".\..\samples\sample.rc">\r
+                       </File>\r

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