X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f0f6a32d4d276dd09ecf34cf60d435d2687731f9..1ec4e9c2b72a01a7ba7da569e0f8d04a81aaba10:/tests/test_vc7_test_gui.vcproj

diff --git a/tests/test_vc7_test_gui.vcproj b/tests/test_vc7_test_gui.vcproj
index 4343100238..4342115560 100644
--- a/tests/test_vc7_test_gui.vcproj
+++ b/tests/test_vc7_test_gui.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <!--
 
-  This makefile was generated by
-  Bakefile 0.2.3 (http://www.bakefile.org)
+  This project was generated by
+  Bakefile 0.2.9 (http://www.bakefile.org)
   Do not modify, all changes will be overwritten!
 
 -->
@@ -17,238 +17,274 @@
 	</Platforms>
 	<Configurations>
 		<Configuration
-			Name="DLL Universal Release|Win32"
-			OutputDirectory="vc_mswunivudll"
-			IntermediateDirectory="vc_mswunivudll\test_gui"
+			Name="Debug|Win32"
+			OutputDirectory="vc_mswud"
+			IntermediateDirectory="vc_mswud\test_gui"
 			ConfigurationType="1"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
 			CharacterSet="1">
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCIDLTool"/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"
-				MinimalRebuild="false"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="2"
-				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
+				Optimization="0"
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"
+				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"
+				MinimalRebuild="TRUE"
+				ExceptionHandling="TRUE"
 				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="TRUE"
+				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswunivudll\testprec_test_gui.pch"
-				AssemblerListingLocation="vc_mswunivudll\test_gui\"
-				ObjectFile="vc_mswunivudll\test_gui\"
-				ProgramDataBaseFileName="vc_mswunivudll\test_gui.pdb"
+				PrecompiledHeaderFile="vc_mswud\testprec_test_gui.pch"
+				ObjectFile="vc_mswud\test_gui\"
+				ProgramDataBaseFileName="vc_mswud\test_gui.pdb"
 				WarningLevel="4"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"
-				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"/>
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				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"
 				AdditionalOptions=""
-				OutputFile="vc_mswunivudll\test_gui.exe"
+				AdditionalDependencies="wxmsw29ud_webview.lib wxmsw29ud_richtext.lib  wxmsw29ud_media.lib  wxmsw29ud_xrc.lib  wxbase29ud_xml.lib  wxmsw29ud_adv.lib  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 wininet.lib"
+				OutputFile="vc_mswud\test_gui.exe"
 				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories=".\..\lib\vc_lib"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="vc_mswud\test_gui.pdb"
 				SubSystem="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".\..\lib\vc_dll"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswunivudll\test_gui.pdb"
 				TargetMachine="1"/>
 			<Tool
-				Name="VCALinkTool"/>
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="vc_mswunivudll\test_vc7_test_gui.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCAppVerifierTool"/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
 				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="DLL Universal Debug|Win32"
-			OutputDirectory="vc_mswunivuddll"
-			IntermediateDirectory="vc_mswunivuddll\test_gui"
+			Name="Release|Win32"
+			OutputDirectory="vc_mswu"
+			IntermediateDirectory="vc_mswu\test_gui"
 			ConfigurationType="1"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
 			CharacterSet="1">
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"
+				PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;NOPCH;_CONSOLE"
+				ExceptionHandling="TRUE"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="3"
+				PrecompiledHeaderThrough="testprec.h"
+				PrecompiledHeaderFile="vc_mswu\testprec_test_gui.pch"
+				ObjectFile="vc_mswu\test_gui\"
+				ProgramDataBaseFileName="vc_mswu\test_gui.pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCLinkerTool"
+				AdditionalOptions=""
+				AdditionalDependencies="wxmsw29u_webview.lib wxmsw29u_richtext.lib  wxmsw29u_media.lib  wxmsw29u_xrc.lib  wxbase29u_xml.lib  wxmsw29u_adv.lib  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 wininet.lib"
+				OutputFile="vc_mswu\test_gui.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories=".\..\lib\vc_lib"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="vc_mswu\test_gui.pdb"
+				SubSystem="1"
+				TargetMachine="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;NOPCH;_CONSOLE"
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;NOPCH;_CONSOLE"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCIDLTool"/>
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Universal Debug|Win32"
+			OutputDirectory="vc_mswunivud"
+			IntermediateDirectory="vc_mswunivud\test_gui"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="1">
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="3"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"
+				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"
+				MinimalRebuild="TRUE"
+				ExceptionHandling="TRUE"
 				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="TRUE"
+				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswunivuddll\testprec_test_gui.pch"
-				AssemblerListingLocation="vc_mswunivuddll\test_gui\"
-				ObjectFile="vc_mswunivuddll\test_gui\"
-				ProgramDataBaseFileName="vc_mswunivuddll\test_gui.pdb"
+				PrecompiledHeaderFile="vc_mswunivud\testprec_test_gui.pch"
+				ObjectFile="vc_mswunivud\test_gui\"
+				ProgramDataBaseFileName="vc_mswunivud\test_gui.pdb"
 				WarningLevel="4"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"/>
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				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"
 				AdditionalOptions=""
-				OutputFile="vc_mswunivuddll\test_gui.exe"
+				AdditionalDependencies="wxmswuniv29ud_webview.lib wxmswuniv29ud_richtext.lib  wxmswuniv29ud_media.lib  wxmswuniv29ud_xrc.lib  wxbase29ud_xml.lib  wxmswuniv29ud_adv.lib  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 wininet.lib"
+				OutputFile="vc_mswunivud\test_gui.exe"
 				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories=".\..\lib\vc_lib"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="vc_mswunivud\test_gui.pdb"
 				SubSystem="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".\..\lib\vc_dll"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswunivuddll\test_gui.pdb"
 				TargetMachine="1"/>
 			<Tool
-				Name="VCALinkTool"/>
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="vc_mswunivuddll\test_vc7_test_gui.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCAppVerifierTool"/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
 				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="DLL Release|Win32"
-			OutputDirectory="vc_mswudll"
-			IntermediateDirectory="vc_mswudll\test_gui"
+			Name="Universal Release|Win32"
+			OutputDirectory="vc_mswunivu"
+			IntermediateDirectory="vc_mswunivu\test_gui"
 			ConfigurationType="1"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
 			CharacterSet="1">
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCIDLTool"/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"
-				MinimalRebuild="false"
-				ExceptionHandling="1"
-				AdditionalOptions=""
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"
+				PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;NOPCH;_CONSOLE"
+				ExceptionHandling="TRUE"
 				RuntimeLibrary="2"
-				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
+				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswudll\testprec_test_gui.pch"
-				AssemblerListingLocation="vc_mswudll\test_gui\"
-				ObjectFile="vc_mswudll\test_gui\"
-				ProgramDataBaseFileName="vc_mswudll\test_gui.pdb"
+				PrecompiledHeaderFile="vc_mswunivu\testprec_test_gui.pch"
+				ObjectFile="vc_mswunivu\test_gui\"
+				ProgramDataBaseFileName="vc_mswunivu\test_gui.pdb"
 				WarningLevel="4"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"
-				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				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"
 				AdditionalOptions=""
-				OutputFile="vc_mswudll\test_gui.exe"
-				LinkIncremental="2"
+				AdditionalDependencies="wxmswuniv29u_webview.lib wxmswuniv29u_richtext.lib  wxmswuniv29u_media.lib  wxmswuniv29u_xrc.lib  wxbase29u_xml.lib  wxmswuniv29u_adv.lib  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 wininet.lib"
+				OutputFile="vc_mswunivu\test_gui.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories=".\..\lib\vc_lib"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="vc_mswunivu\test_gui.pdb"
 				SubSystem="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".\..\lib\vc_dll"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll\test_gui.pdb"
-				TargetMachine="1"/>
+				TargetMachine="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;NOPCH;_CONSOLE"
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCALinkTool"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll\test_vc7_test_gui.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;NOPCH;_CONSOLE"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCAppVerifierTool"/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
 				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|Win32"
@@ -256,389 +292,269 @@
 			IntermediateDirectory="vc_mswuddll\test_gui"
 			ConfigurationType="1"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
 			CharacterSet="1">
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCIDLTool"/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="3"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
+				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
+				MinimalRebuild="TRUE"
+				ExceptionHandling="TRUE"
 				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="TRUE"
+				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="testprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\testprec_test_gui.pch"
-				AssemblerListingLocation="vc_mswuddll\test_gui\"
 				ObjectFile="vc_mswuddll\test_gui\"
 				ProgramDataBaseFileName="vc_mswuddll\test_gui.pdb"
 				WarningLevel="4"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"/>
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				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"
 				AdditionalOptions=""
+				AdditionalDependencies="wxmsw29ud_webview.lib wxmsw29ud_richtext.lib  wxmsw29ud_media.lib  wxmsw29ud_xrc.lib  wxbase29ud_xml.lib  wxmsw29ud_adv.lib  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 wininet.lib"
 				OutputFile="vc_mswuddll\test_gui.exe"
 				LinkIncremental="2"
-				SubSystem="1"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=".\..\lib\vc_dll"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="vc_mswuddll\test_gui.pdb"
+				SubSystem="1"
 				TargetMachine="1"/>
 			<Tool
-				Name="VCALinkTool"/>
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll\test_vc7_test_gui.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCAppVerifierTool"/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
 				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="Universal Release|Win32"
-			OutputDirectory="vc_mswunivu"
-			IntermediateDirectory="vc_mswunivu\test_gui"
+			Name="DLL Release|Win32"
+			OutputDirectory="vc_mswudll"
+			IntermediateDirectory="vc_mswudll\test_gui"
 			ConfigurationType="1"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
 			CharacterSet="1">
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCIDLTool"/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"
-				MinimalRebuild="false"
-				ExceptionHandling="1"
-				AdditionalOptions=""
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"
+				PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
+				ExceptionHandling="TRUE"
 				RuntimeLibrary="2"
-				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
+				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswunivu\testprec_test_gui.pch"
-				AssemblerListingLocation="vc_mswunivu\test_gui\"
-				ObjectFile="vc_mswunivu\test_gui\"
-				ProgramDataBaseFileName="vc_mswunivu\test_gui.pdb"
+				PrecompiledHeaderFile="vc_mswudll\testprec_test_gui.pch"
+				ObjectFile="vc_mswudll\test_gui\"
+				ProgramDataBaseFileName="vc_mswudll\test_gui.pdb"
 				WarningLevel="4"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"
-				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"/>
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				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"
 				AdditionalOptions=""
-				OutputFile="vc_mswunivu\test_gui.exe"
-				LinkIncremental="2"
+				AdditionalDependencies="wxmsw29u_webview.lib wxmsw29u_richtext.lib  wxmsw29u_media.lib  wxmsw29u_xrc.lib  wxbase29u_xml.lib  wxmsw29u_adv.lib  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 wininet.lib"
+				OutputFile="vc_mswudll\test_gui.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories=".\..\lib\vc_dll"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="vc_mswudll\test_gui.pdb"
 				SubSystem="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".\..\lib\vc_lib"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswunivu\test_gui.pdb"
-				TargetMachine="1"/>
+				TargetMachine="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"/>
 			<Tool
-				Name="VCALinkTool"/>
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="vc_mswunivu\test_vc7_test_gui.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCAppVerifierTool"/>
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
 				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="Universal Debug|Win32"
-			OutputDirectory="vc_mswunivud"
-			IntermediateDirectory="vc_mswunivud\test_gui"
+			Name="DLL Universal Debug|Win32"
+			OutputDirectory="vc_mswunivuddll"
+			IntermediateDirectory="vc_mswunivuddll\test_gui"
 			ConfigurationType="1"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
 			CharacterSet="1">
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCIDLTool"/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="3"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"
+				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
+				MinimalRebuild="TRUE"
+				ExceptionHandling="TRUE"
 				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="TRUE"
+				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswunivud\testprec_test_gui.pch"
-				AssemblerListingLocation="vc_mswunivud\test_gui\"
-				ObjectFile="vc_mswunivud\test_gui\"
-				ProgramDataBaseFileName="vc_mswunivud\test_gui.pdb"
+				PrecompiledHeaderFile="vc_mswunivuddll\testprec_test_gui.pch"
+				ObjectFile="vc_mswunivuddll\test_gui\"
+				ProgramDataBaseFileName="vc_mswunivuddll\test_gui.pdb"
 				WarningLevel="4"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"/>
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				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"
 				AdditionalOptions=""
-				OutputFile="vc_mswunivud\test_gui.exe"
+				AdditionalDependencies="wxmswuniv29ud_webview.lib wxmswuniv29ud_richtext.lib  wxmswuniv29ud_media.lib  wxmswuniv29ud_xrc.lib  wxbase29ud_xml.lib  wxmswuniv29ud_adv.lib  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 wininet.lib"
+				OutputFile="vc_mswunivuddll\test_gui.exe"
 				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories=".\..\lib\vc_dll"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="vc_mswunivuddll\test_gui.pdb"
 				SubSystem="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".\..\lib\vc_lib"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswunivud\test_gui.pdb"
 				TargetMachine="1"/>
 			<Tool
-				Name="VCALinkTool"/>
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="vc_mswunivud\test_vc7_test_gui.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCAppVerifierTool"/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
 				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="vc_mswu"
-			IntermediateDirectory="vc_mswu\test_gui"
+			Name="DLL Universal Release|Win32"
+			OutputDirectory="vc_mswunivudll"
+			IntermediateDirectory="vc_mswunivudll\test_gui"
 			ConfigurationType="1"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
 			CharacterSet="1">
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCIDLTool"/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"
-				MinimalRebuild="false"
-				ExceptionHandling="1"
-				AdditionalOptions=""
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"
+				PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
+				ExceptionHandling="TRUE"
 				RuntimeLibrary="2"
-				PreprocessorDefinitions="__WXMSW__;_UNICODE;NOPCH;_CONSOLE"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
+				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswu\testprec_test_gui.pch"
-				AssemblerListingLocation="vc_mswu\test_gui\"
-				ObjectFile="vc_mswu\test_gui\"
-				ProgramDataBaseFileName="vc_mswu\test_gui.pdb"
+				PrecompiledHeaderFile="vc_mswunivudll\testprec_test_gui.pch"
+				ObjectFile="vc_mswunivudll\test_gui\"
+				ProgramDataBaseFileName="vc_mswunivudll\test_gui.pdb"
 				WarningLevel="4"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"
-				PreprocessorDefinitions="__WXMSW__;_UNICODE;NOPCH;_CONSOLE"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				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"
 				AdditionalOptions=""
-				OutputFile="vc_mswu\test_gui.exe"
-				LinkIncremental="2"
+				AdditionalDependencies="wxmswuniv29u_webview.lib wxmswuniv29u_richtext.lib  wxmswuniv29u_media.lib  wxmswuniv29u_xrc.lib  wxbase29u_xml.lib  wxmswuniv29u_adv.lib  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 wininet.lib"
+				OutputFile="vc_mswunivudll\test_gui.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories=".\..\lib\vc_dll"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="vc_mswunivudll\test_gui.pdb"
 				SubSystem="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".\..\lib\vc_lib"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu\test_gui.pdb"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCALinkTool"/>
+				TargetMachine="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
-			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="vc_mswu\test_vc7_test_gui.bsc"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCFxCopTool"/>
-			<Tool
-				Name="VCAppVerifierTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="vc_mswud"
-			IntermediateDirectory="vc_mswud\test_gui"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1">
 			<Tool
 				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCIDLTool"/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="3"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="3"
-				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswud\testprec_test_gui.pch"
-				AssemblerListingLocation="vc_mswud\test_gui\"
-				ObjectFile="vc_mswud\test_gui\"
-				ProgramDataBaseFileName="vc_mswud\test_gui.pdb"
-				WarningLevel="4"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				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"
-				AdditionalOptions=""
-				OutputFile="vc_mswud\test_gui.exe"
-				LinkIncremental="2"
-				SubSystem="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".\..\lib\vc_lib"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud\test_gui.pdb"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCALinkTool"/>
-			<Tool
-				Name="VCXDCMakeTool"/>
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="vc_mswud\test_vc7_test_gui.bsc"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCAppVerifierTool"/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
 				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -647,88 +563,313 @@
 	<Files>
 		<Filter
 			Name="Source Files"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath=".\menu\accelentry.cpp">
+			</File>
+			<File
+				RelativePath=".\graphics\affinematrix.cpp">
+			</File>
+			<File
+				RelativePath=".\asserthelper.cpp">
+			</File>
+			<File
+				RelativePath=".\graphics\bitmap.cpp">
+			</File>
+			<File
+				RelativePath=".\controls\bitmapcomboboxtest.cpp">
+			</File>
 			<File
-				RelativePath=".\window\clientsize.cpp"/>
+				RelativePath=".\controls\bitmaptogglebuttontest.cpp">
+			</File>
+			<File
+				RelativePath=".\controls\bookctrlbasetest.cpp">
+			</File>
 			<File
-				RelativePath=".\config\config.cpp"/>
+				RelativePath=".\sizers\boxsizer.cpp">
+			</File>
+			<File
+				RelativePath=".\controls\buttontest.cpp">
+			</File>
+			<File
+				RelativePath=".\controls\checkboxtest.cpp">
+			</File>
+			<File
+				RelativePath=".\controls\checklistboxtest.cpp">
+			</File>
+			<File
+				RelativePath=".\controls\choicebooktest.cpp">
+			</File>
+			<File
+				RelativePath=".\controls\choicetest.cpp">
+			</File>
+			<File
+				RelativePath=".\window\clientsize.cpp">
+			</File>
+			<File
+				RelativePath=".\events\clone.cpp">
+			</File>
+			<File
+				RelativePath=".\graphics\colour.cpp">
+			</File>
+			<File
+				RelativePath=".\controls\comboboxtest.cpp">
+			</File>
+			<File
+				RelativePath=".\config\config.cpp">
+			</File>
+			<File
+				RelativePath=".\controls\dataviewctrltest.cpp">
+			</File>
+			<File
+				RelativePath=".\controls\datepickerctrltest.cpp">
+			</File>
+			<File
+				RelativePath=".\controls\dialogtest.cpp">
+			</File>
 			<File
 				RelativePath=".\dummy.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32">
+					Name="Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="1"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32">
+					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="1"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Release|Win32">
+					Name="Universal Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="1"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Debug|Win32">
+					Name="Universal Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="1"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Release|Win32">
+					Name="DLL Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="1"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Debug|Win32">
+					Name="DLL Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="1"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="DLL Universal Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="1"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="DLL Universal Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="1"/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\geometry\point.cpp"/>
+				RelativePath=".\graphics\ellipsization.cpp">
+			</File>
 			<File
-				RelativePath=".\image\rawbmp.cpp"/>
+				RelativePath=".\font\fonttest.cpp">
+			</File>
 			<File
-				RelativePath=".\geometry\rect.cpp"/>
+				RelativePath=".\controls\frametest.cpp">
+			</File>
 			<File
-				RelativePath=".\misc\selstoretest.cpp"/>
+				RelativePath=".\misc\garbage.cpp">
+			</File>
+			<File
+				RelativePath=".\controls\gaugetest.cpp">
+			</File>
+			<File
+				RelativePath=".\controls\gridtest.cpp">
+			</File>
 			<File
-				RelativePath=".\window\setsize.cpp"/>
+				RelativePath=".\misc\guifuncs.cpp">
+			</File>
 			<File
-				RelativePath=".\geometry\size.cpp"/>
+				RelativePath=".\controls\headerctrltest.cpp">
+			</File>
 			<File
-				RelativePath=".\test.cpp"/>
+				RelativePath=".\controls\htmllboxtest.cpp">
+			</File>
 			<File
-				RelativePath=".\controls\textctrltest.cpp"/>
+				RelativePath=".\html\htmlparser.cpp">
+			</File>
 			<File
-				RelativePath=".\controls\textentrytest.cpp"/>
+				RelativePath=".\html\htmlwindow.cpp">
+			</File>
+			<File
+				RelativePath=".\controls\hyperlinkctrltest.cpp">
+			</File>
+			<File
+				RelativePath=".\image\image.cpp">
+			</File>
+			<File
+				RelativePath=".\controls\itemcontainertest.cpp">
+			</File>
+			<File
+				RelativePath=".\events\keyboard.cpp">
+			</File>
+			<File
+				RelativePath=".\controls\label.cpp">
+			</File>
+			<File
+				RelativePath=".\controls\listbasetest.cpp">
+			</File>
+			<File
+				RelativePath=".\controls\listbooktest.cpp">
+			</File>
+			<File
+				RelativePath=".\controls\listboxtest.cpp">
+			</File>
+			<File
+				RelativePath=".\controls\listctrltest.cpp">
+			</File>
+			<File
+				RelativePath=".\controls\listviewtest.cpp">
+			</File>
+			<File
+				RelativePath=".\controls\markuptest.cpp">
+			</File>
+			<File
+				RelativePath=".\graphics\measuring.cpp">
+			</File>
+			<File
+				RelativePath=".\menu\menu.cpp">
+			</File>
+			<File
+				RelativePath=".\controls\notebooktest.cpp">
+			</File>
+			<File
+				RelativePath=".\controls\ownerdrawncomboboxtest.cpp">
+			</File>
+			<File
+				RelativePath=".\controls\pickerbasetest.cpp">
+			</File>
+			<File
+				RelativePath=".\controls\pickertest.cpp">
+			</File>
+			<File
+				RelativePath=".\geometry\point.cpp">
+			</File>
+			<File
+				RelativePath=".\events\propagation.cpp">
+			</File>
+			<File
+				RelativePath=".\controls\radioboxtest.cpp">
+			</File>
+			<File
+				RelativePath=".\controls\radiobuttontest.cpp">
+			</File>
+			<File
+				RelativePath=".\image\rawbmp.cpp">
+			</File>
+			<File
+				RelativePath=".\controls\rearrangelisttest.cpp">
+			</File>
+			<File
+				RelativePath=".\geometry\rect.cpp">
+			</File>
+			<File
+				RelativePath=".\geometry\region.cpp">
+			</File>
+			<File
+				RelativePath=".\controls\richtextctrltest.cpp">
+			</File>
+			<File
+				RelativePath=".\misc\selstoretest.cpp">
+			</File>
+			<File
+				RelativePath=".\window\setsize.cpp">
+			</File>
+			<File
+				RelativePath=".\misc\settings.cpp">
+			</File>
+			<File
+				RelativePath=".\geometry\size.cpp">
+			</File>
+			<File
+				RelativePath=".\controls\slidertest.cpp">
+			</File>
+			<File
+				RelativePath=".\net\socket.cpp">
+			</File>
+			<File
+				RelativePath=".\controls\spinctrldbltest.cpp">
+			</File>
+			<File
+				RelativePath=".\controls\spinctrltest.cpp">
+			</File>
+			<File
+				RelativePath=".\test.cpp">
+			</File>
+			<File
+				RelativePath=".\testableframe.cpp">
+			</File>
+			<File
+				RelativePath=".\controls\textctrltest.cpp">
+			</File>
+			<File
+				RelativePath=".\controls\textentrytest.cpp">
+			</File>
+			<File
+				RelativePath=".\controls\togglebuttontest.cpp">
+			</File>
+			<File
+				RelativePath=".\controls\toolbooktest.cpp">
+			</File>
+			<File
+				RelativePath=".\toplevel\toplevel.cpp">
+			</File>
+			<File
+				RelativePath=".\controls\treebooktest.cpp">
+			</File>
+			<File
+				RelativePath=".\controls\treectrltest.cpp">
+			</File>
+			<File
+				RelativePath=".\controls\treelistctrltest.cpp">
+			</File>
+			<File
+				RelativePath=".\validators\valnum.cpp">
+			</File>
+			<File
+				RelativePath=".\controls\virtlistctrltest.cpp">
+			</File>
+			<File
+				RelativePath=".\controls\webtest.cpp">
+			</File>
+			<File
+				RelativePath=".\controls\windowtest.cpp">
+			</File>
+			<File
+				RelativePath=".\sizers\wrapsizer.cpp">
+			</File>
+			<File
+				RelativePath=".\xml\xrctest.cpp">
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
 			<File
-				RelativePath=".\..\samples\sample.rc"/>
+				RelativePath="..\samples\sample.rc">
+			</File>
 		</Filter>
 	</Files>
 	<Globals>