X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fa97ee2490d920eaf1e2ad7a719a7797222e2c5b..5dec941a5ba3c08870ab4b415dd6e5be368fa0f0:/tests/test_vc9_test_gui.vcproj

diff --git a/tests/test_vc9_test_gui.vcproj b/tests/test_vc9_test_gui.vcproj
index 31c7de222e..558de52aff 100644
--- a/tests/test_vc9_test_gui.vcproj
+++ b/tests/test_vc9_test_gui.vcproj
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <!--
 
-  This makefile was generated by
-  Bakefile 0.2.5 (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!
 
 -->
@@ -22,9 +22,9 @@
 	</ToolFiles>
 	<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"
@@ -43,23 +43,26 @@
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
 			<Tool
-				Name="VCIDLTool"
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
-				Optimization="2"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"
-				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
+				Optimization="0"
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"
+				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"
 				ExceptionHandling="1"
-				RuntimeLibrary="2"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				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"
 				DebugInformationFormat="3"
@@ -69,9 +72,9 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -79,14 +82,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="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"
+				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_dll"
+				AdditionalLibraryDirectories=".\..\lib\vc_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswunivudll\test_gui.pdb"
+				ProgramDatabaseFile="vc_mswud\test_gui.pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>
@@ -101,7 +104,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswunivudll\test_vc9_test_gui.bsc"
+				OutputFile="vc_mswud\test_vc9_test_gui.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -115,9 +118,9 @@
 			/>
 		</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"
@@ -136,25 +139,24 @@
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
 			<Tool
-				Name="VCIDLTool"
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;NOPCH;_CONSOLE"
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
-				Optimization="0"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
+				Optimization="2"
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"
+				PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;NOPCH;_CONSOLE"
 				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
+				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				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_mswu\testprec_test_gui.pch"
+				ObjectFile="vc_mswu\test_gui\"
+				ProgramDataBaseFileName="vc_mswu\test_gui.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -164,9 +166,9 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
+				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;NOPCH;_CONSOLE"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -174,16 +176,18 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="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"
+				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_dll"
+				AdditionalLibraryDirectories=".\..\lib\vc_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswunivuddll\test_gui.pdb"
+				ProgramDatabaseFile="vc_mswu\test_gui.pdb"
 				SubSystem="1"
 				TargetMachine="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -196,7 +200,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswunivuddll\test_vc9_test_gui.bsc"
+				OutputFile="vc_mswu\test_vc9_test_gui.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -210,9 +214,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="DLL Release|Win32"
-			OutputDirectory="vc_mswudll"
-			IntermediateDirectory="vc_mswudll\test_gui"
+			Name="Universal Debug|Win32"
+			OutputDirectory="vc_mswunivud"
+			IntermediateDirectory="vc_mswunivud\test_gui"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -231,23 +235,26 @@
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
 			<Tool
-				Name="VCIDLTool"
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
-				Optimization="2"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"
-				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
+				Optimization="0"
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"
+				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"
 				ExceptionHandling="1"
-				RuntimeLibrary="2"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				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_mswunivud\testprec_test_gui.pch"
+				ObjectFile="vc_mswunivud\test_gui\"
+				ProgramDataBaseFileName="vc_mswunivud\test_gui.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -257,9 +264,9 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -267,14 +274,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="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"
+				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_dll"
+				AdditionalLibraryDirectories=".\..\lib\vc_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll\test_gui.pdb"
+				ProgramDatabaseFile="vc_mswunivud\test_gui.pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>
@@ -289,7 +296,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll\test_vc9_test_gui.bsc"
+				OutputFile="vc_mswunivud\test_vc9_test_gui.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -303,9 +310,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="DLL Debug|Win32"
-			OutputDirectory="vc_mswuddll"
-			IntermediateDirectory="vc_mswuddll\test_gui"
+			Name="Universal Release|Win32"
+			OutputDirectory="vc_mswunivu"
+			IntermediateDirectory="vc_mswunivu\test_gui"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -324,25 +331,24 @@
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
 			<Tool
-				Name="VCIDLTool"
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;NOPCH;_CONSOLE"
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
-				Optimization="0"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
+				Optimization="2"
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"
+				PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;NOPCH;_CONSOLE"
 				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
+				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				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"
+				PrecompiledHeaderFile="vc_mswunivu\testprec_test_gui.pch"
+				ObjectFile="vc_mswunivu\test_gui\"
+				ProgramDataBaseFileName="vc_mswunivu\test_gui.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -352,9 +358,9 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
+				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;NOPCH;_CONSOLE"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -362,16 +368,18 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="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"
+				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_dll"
+				AdditionalLibraryDirectories=".\..\lib\vc_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll\test_gui.pdb"
+				ProgramDatabaseFile="vc_mswunivu\test_gui.pdb"
 				SubSystem="1"
 				TargetMachine="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -384,7 +392,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll\test_vc9_test_gui.bsc"
+				OutputFile="vc_mswunivu\test_vc9_test_gui.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -398,9 +406,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Universal Release|Win32"
-			OutputDirectory="vc_mswunivu"
-			IntermediateDirectory="vc_mswunivu\test_gui"
+			Name="DLL Debug|Win32"
+			OutputDirectory="vc_mswuddll"
+			IntermediateDirectory="vc_mswuddll\test_gui"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -419,23 +427,26 @@
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
 			<Tool
-				Name="VCIDLTool"
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
-				Optimization="2"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"
-				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"
+				Optimization="0"
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"
+				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
 				ExceptionHandling="1"
-				RuntimeLibrary="2"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				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_mswuddll\testprec_test_gui.pch"
+				ObjectFile="vc_mswuddll\test_gui\"
+				ProgramDataBaseFileName="vc_mswuddll\test_gui.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -445,9 +456,9 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -455,14 +466,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="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"
+				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"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".\..\lib\vc_lib"
+				AdditionalLibraryDirectories=".\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswunivu\test_gui.pdb"
+				ProgramDatabaseFile="vc_mswuddll\test_gui.pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>
@@ -477,7 +488,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswunivu\test_vc9_test_gui.bsc"
+				OutputFile="vc_mswuddll\test_vc9_test_gui.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,9 +502,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Universal Debug|Win32"
-			OutputDirectory="vc_mswunivud"
-			IntermediateDirectory="vc_mswunivud\test_gui"
+			Name="DLL Release|Win32"
+			OutputDirectory="vc_mswudll"
+			IntermediateDirectory="vc_mswudll\test_gui"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -512,25 +523,24 @@
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
 			<Tool
-				Name="VCIDLTool"
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
-				Optimization="0"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"
+				Optimization="2"
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"
+				PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
 				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
+				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				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_mswudll\testprec_test_gui.pch"
+				ObjectFile="vc_mswudll\test_gui\"
+				ProgramDataBaseFileName="vc_mswudll\test_gui.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -540,9 +550,9 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"
+				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -550,16 +560,18 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="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"
+				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_lib"
+				AdditionalLibraryDirectories=".\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswunivud\test_gui.pdb"
+				ProgramDatabaseFile="vc_mswudll\test_gui.pdb"
 				SubSystem="1"
 				TargetMachine="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -572,7 +584,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswunivud\test_vc9_test_gui.bsc"
+				OutputFile="vc_mswudll\test_vc9_test_gui.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -586,9 +598,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="vc_mswu"
-			IntermediateDirectory="vc_mswu\test_gui"
+			Name="DLL Universal Debug|Win32"
+			OutputDirectory="vc_mswunivuddll"
+			IntermediateDirectory="vc_mswunivuddll\test_gui"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -607,23 +619,26 @@
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
 			<Tool
-				Name="VCIDLTool"
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
-				Optimization="2"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"
-				PreprocessorDefinitions="__WXMSW__;_UNICODE;NOPCH;_CONSOLE"
+				Optimization="0"
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"
+				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
 				ExceptionHandling="1"
-				RuntimeLibrary="2"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				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_mswunivuddll\testprec_test_gui.pch"
+				ObjectFile="vc_mswunivuddll\test_gui\"
+				ProgramDataBaseFileName="vc_mswunivuddll\test_gui.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -633,9 +648,9 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="__WXMSW__;_UNICODE;NOPCH;_CONSOLE"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -643,14 +658,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="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"
+				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_lib"
+				AdditionalLibraryDirectories=".\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu\test_gui.pdb"
+				ProgramDatabaseFile="vc_mswunivuddll\test_gui.pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>
@@ -665,7 +680,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu\test_vc9_test_gui.bsc"
+				OutputFile="vc_mswunivuddll\test_vc9_test_gui.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -679,9 +694,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="vc_mswud"
-			IntermediateDirectory="vc_mswud\test_gui"
+			Name="DLL Universal Release|Win32"
+			OutputDirectory="vc_mswunivudll"
+			IntermediateDirectory="vc_mswunivudll\test_gui"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -700,25 +715,24 @@
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
 			<Tool
-				Name="VCIDLTool"
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
-				Optimization="0"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"
+				Optimization="2"
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"
+				PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
 				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
+				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				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"
+				PrecompiledHeaderFile="vc_mswunivudll\testprec_test_gui.pch"
+				ObjectFile="vc_mswunivudll\test_gui\"
+				ProgramDataBaseFileName="vc_mswunivudll\test_gui.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -728,9 +742,9 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"
+				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -738,16 +752,18 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="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"
+				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_lib"
+				AdditionalLibraryDirectories=".\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud\test_gui.pdb"
+				ProgramDatabaseFile="vc_mswunivudll\test_gui.pdb"
 				SubSystem="1"
 				TargetMachine="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -760,7 +776,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud\test_vc9_test_gui.bsc"
+				OutputFile="vc_mswunivudll\test_vc9_test_gui.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -783,10 +799,70 @@
 			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=".\controls\bitmaptogglebuttontest.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\controls\bookctrlbasetest.cpp"
+				>
+			</File>
+			<File
+				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"
 				>
@@ -795,11 +871,19 @@
 				RelativePath=".\config\config.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\controls\dataviewctrltest.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\controls\datepickerctrltest.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\dummy.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -807,7 +891,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -815,7 +899,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Universal Debug|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -823,7 +907,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Universal Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -831,7 +915,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Debug|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -839,7 +923,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -847,7 +931,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -855,7 +939,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -863,10 +947,30 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath=".\graphics\ellipsization.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\font\fonttest.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\controls\frametest.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\misc\garbage.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\controls\gaugetest.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\controls\gridtest.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\misc\guifuncs.cpp"
 				>
@@ -875,14 +979,86 @@
 				RelativePath=".\controls\headerctrltest.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\controls\htmllboxtest.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\html\htmlparser.cpp"
+				>
+			</File>
 			<File
 				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"
 				>
@@ -891,14 +1067,34 @@
 				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"
 				>
@@ -907,18 +1103,38 @@
 				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"
 				>
@@ -927,10 +1143,54 @@
 				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"
@@ -938,7 +1198,7 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File
-				RelativePath=".\..\samples\sample.rc"
+				RelativePath="..\samples\sample.rc"
 				>
 			</File>
 		</Filter>