X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c88a264a08a023e9544b684fd2dc28e8dd7b1c7d..4d833b7b7f86cc7a182a07b52e96705ca7c4c49f:/build/msw/wx_vc7_xrc.vcproj?ds=sidebyside

diff --git a/build/msw/wx_vc7_xrc.vcproj b/build/msw/wx_vc7_xrc.vcproj
index 93026d74bd..c23ea96911 100644
--- a/build/msw/wx_vc7_xrc.vcproj
+++ b/build/msw/wx_vc7_xrc.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)
+  Bakefile 0.2.5 (http://www.bakefile.org)
   Do not modify, all changes will be overwritten!
 
 -->
@@ -22,32 +22,16 @@
 			IntermediateDirectory="vc_mswunivudll\xrc"
 			ConfigurationType="2"
 			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;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				MinimalRebuild="false"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="2"
 				PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
+				ExceptionHandling="TRUE"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswunivudll\wxprec_xrcdll.pch"
@@ -55,40 +39,46 @@
 				ObjectFile="vc_mswunivudll\xrc\"
 				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290u_xrc_vc_custom.pdb"
 				WarningLevel="4"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"/>
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv29u_html.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib"
 				AdditionalOptions=""
+				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_html.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib"
 				OutputFile="..\..\lib\vc_dll\wxmswuniv290u_xrc_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_xrc.lib"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290u_xrc_vc_custom.pdb"
 				TargetMachine="1"/>
 			<Tool
-				Name="VCALinkTool"/>
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_vc7_xrc.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
 			Name="DLL Universal Debug|Win32"
@@ -96,32 +86,19 @@
 			IntermediateDirectory="vc_mswunivuddll\xrc"
 			ConfigurationType="2"
 			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\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="3"
 				PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC"
+				MinimalRebuild="TRUE"
+				ExceptionHandling="TRUE"
 				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="TRUE"
+				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswunivuddll\wxprec_xrcdll.pch"
@@ -129,40 +106,46 @@
 				ObjectFile="vc_mswunivuddll\xrc\"
 				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290ud_xrc_vc_custom.pdb"
 				WarningLevel="4"
-				SuppressStartupBanner="true"/>
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv29ud_html.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib"
 				AdditionalOptions=""
+				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_html.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib"
 				OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_xrc_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_xrc.lib"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290ud_xrc_vc_custom.pdb"
 				TargetMachine="1"/>
 			<Tool
-				Name="VCALinkTool"/>
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_vc7_xrc.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
 			Name="DLL Release|Win32"
@@ -170,32 +153,16 @@
 			IntermediateDirectory="vc_mswudll\xrc"
 			ConfigurationType="2"
 			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;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				MinimalRebuild="false"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="2"
 				PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
+				ExceptionHandling="TRUE"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_xrcdll.pch"
@@ -203,40 +170,46 @@
 				ObjectFile="vc_mswudll\xrc\"
 				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290u_xrc_vc_custom.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;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw29u_html.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib"
 				AdditionalOptions=""
+				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_html.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib"
 				OutputFile="..\..\lib\vc_dll\wxmsw290u_xrc_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw29u_xrc.lib"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290u_xrc_vc_custom.pdb"
 				TargetMachine="1"/>
 			<Tool
-				Name="VCALinkTool"/>
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_vc7_xrc.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|Win32"
@@ -244,32 +217,19 @@
 			IntermediateDirectory="vc_mswuddll\xrc"
 			ConfigurationType="2"
 			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;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="3"
 				PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC"
+				MinimalRebuild="TRUE"
+				ExceptionHandling="TRUE"
 				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="TRUE"
+				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_xrcdll.pch"
@@ -277,40 +237,46 @@
 				ObjectFile="vc_mswuddll\xrc\"
 				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290ud_xrc_vc_custom.pdb"
 				WarningLevel="4"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw29ud_html.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib"
 				AdditionalOptions=""
+				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_html.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib"
 				OutputFile="..\..\lib\vc_dll\wxmsw290ud_xrc_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_xrc.lib"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290ud_xrc_vc_custom.pdb"
 				TargetMachine="1"/>
 			<Tool
-				Name="VCALinkTool"/>
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_vc7_xrc.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
 			Name="Universal Release|Win32"
@@ -318,32 +284,16 @@
 			IntermediateDirectory="vc_mswunivu\xrc"
 			ConfigurationType="4"
 			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;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				MinimalRebuild="false"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="2"
 				PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
+				ExceptionHandling="TRUE"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswunivu\wxprec_xrclib.pch"
@@ -351,32 +301,38 @@
 				ObjectFile="vc_mswunivu\xrc\"
 				ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_xrc.pdb"
 				WarningLevel="4"
-				SuppressStartupBanner="true"/>
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"/>
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\vc_lib\wxmswuniv29u_xrc.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxmswuniv29u_xrc.lib"
-				SuppressStartupBanner="true"/>
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
-				Name="VCALinkTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_vc7_xrc.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
 			Name="Universal Debug|Win32"
@@ -384,32 +340,19 @@
 			IntermediateDirectory="vc_mswunivud\xrc"
 			ConfigurationType="4"
 			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;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="3"
 				PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
+				MinimalRebuild="TRUE"
+				ExceptionHandling="TRUE"
 				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="TRUE"
+				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswunivud\wxprec_xrclib.pch"
@@ -417,32 +360,38 @@
 				ObjectFile="vc_mswunivud\xrc\"
 				ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_xrc.pdb"
 				WarningLevel="4"
-				SuppressStartupBanner="true"/>
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"/>
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_xrc.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_xrc.lib"
-				SuppressStartupBanner="true"/>
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
-				Name="VCALinkTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_vc7_xrc.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
@@ -450,32 +399,16 @@
 			IntermediateDirectory="vc_mswu\xrc"
 			ConfigurationType="4"
 			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;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				MinimalRebuild="false"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="2"
 				PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
+				ExceptionHandling="TRUE"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswu\wxprec_xrclib.pch"
@@ -483,32 +416,38 @@
 				ObjectFile="vc_mswu\xrc\"
 				ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_xrc.pdb"
 				WarningLevel="4"
-				SuppressStartupBanner="true"/>
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"/>
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\vc_lib\wxmsw29u_xrc.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxmsw29u_xrc.lib"
-				SuppressStartupBanner="true"/>
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
-				Name="VCALinkTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_vc7_xrc.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
@@ -516,32 +455,19 @@
 			IntermediateDirectory="vc_mswud\xrc"
 			ConfigurationType="4"
 			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\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="3"
 				PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
+				MinimalRebuild="TRUE"
+				ExceptionHandling="TRUE"
 				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="TRUE"
+				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswud\wxprec_xrclib.pch"
@@ -549,32 +475,38 @@
 				ObjectFile="vc_mswud\xrc\"
 				ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_xrc.pdb"
 				WarningLevel="4"
-				SuppressStartupBanner="true"/>
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"/>
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\vc_lib\wxmsw29ud_xrc.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxmsw29ud_xrc.lib"
-				SuppressStartupBanner="true"/>
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
-				Name="VCALinkTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_vc7_xrc.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -643,16 +575,16 @@
 				RelativePath="..\..\src\msw\version.rc">
 				<FileConfiguration
 					Name="Universal Release|Win32"
-					ExcludedFromBuild="true"/>
+					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Universal Debug|Win32"
-					ExcludedFromBuild="true"/>
+					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Release|Win32"
-					ExcludedFromBuild="true"/>
+					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Debug|Win32"
-					ExcludedFromBuild="true"/>
+					ExcludedFromBuild="TRUE"/>
 			</File>
 		</Filter>
 		<Filter
@@ -836,238 +768,361 @@
 			Name="Common Headers"
 			UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}">
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_all.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_all.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_animatctrl.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_animatctrl.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_bmp.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_bmp.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_bmpbt.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_bmpbt.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_bmpcbox.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_bmpcbox.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_bttn.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_bttn.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_cald.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_cald.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_chckb.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_chckb.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_chckl.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_chckl.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_choic.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_choic.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_choicbk.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_choicbk.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_clrpicker.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_clrpicker.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_collpane.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_collpane.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_combo.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_combo.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_comboctrl.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_datectrl.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_datectrl.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_dirpicker.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_dirpicker.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_dlg.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_dlg.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_filepicker.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_filepicker.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_fontpicker.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_fontpicker.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_frame.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_frame.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_gauge.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_gauge.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_gdctl.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_gdctl.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_grid.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_grid.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_html.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_html.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_htmllbox.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_htmllbox.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_hyperlink.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_hyperlink.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_listb.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_listb.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_listbk.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_listbk.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_listc.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_listc.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_mdi.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_mdi.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_menu.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_menu.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_notbk.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_notbk.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_odcombo.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_odcombo.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_panel.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_panel.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_propdlg.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_propdlg.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_radbt.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_radbt.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_radbx.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_radbx.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_scrol.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_scrol.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_scwin.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_scwin.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_sizer.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_sizer.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_slidr.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_slidr.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_spin.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_spin.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_split.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_split.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_srchctrl.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_srchctrl.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_statbar.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_statbar.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_stbmp.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_stbmp.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_stbox.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_stbox.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_stlin.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_stlin.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_sttxt.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_sttxt.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_text.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_text.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_tglbtn.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_tglbtn.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_toolb.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_toolb.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_tree.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_tree.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_treebk.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_treebk.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_unkwn.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_unkwn.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_wizrd.h"/>
+				RelativePath="..\..\include\wx\xrc\xh_wizrd.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xmlres.h"/>
+				RelativePath="..\..\include\wx\xrc\xmlres.h">
+			</File>
 		</Filter>
 		<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="..\..\src\xrc\xh_animatctrl.cpp"/>
+				RelativePath="..\..\src\xrc\xh_animatctrl.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_bmp.cpp"/>
+				RelativePath="..\..\src\xrc\xh_bmp.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_bmpbt.cpp"/>
+				RelativePath="..\..\src\xrc\xh_bmpbt.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_bmpcbox.cpp"/>
+				RelativePath="..\..\src\xrc\xh_bmpcbox.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_bttn.cpp"/>
+				RelativePath="..\..\src\xrc\xh_bttn.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_cald.cpp"/>
+				RelativePath="..\..\src\xrc\xh_cald.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_chckb.cpp"/>
+				RelativePath="..\..\src\xrc\xh_chckb.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_chckl.cpp"/>
+				RelativePath="..\..\src\xrc\xh_chckl.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_choic.cpp"/>
+				RelativePath="..\..\src\xrc\xh_choic.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_choicbk.cpp"/>
+				RelativePath="..\..\src\xrc\xh_choicbk.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_clrpicker.cpp"/>
+				RelativePath="..\..\src\xrc\xh_clrpicker.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_collpane.cpp"/>
+				RelativePath="..\..\src\xrc\xh_collpane.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_combo.cpp"/>
+				RelativePath="..\..\src\xrc\xh_combo.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_datectrl.cpp"/>
+				RelativePath="..\..\src\xrc\xh_comboctrl.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_dirpicker.cpp"/>
+				RelativePath="..\..\src\xrc\xh_datectrl.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_dlg.cpp"/>
+				RelativePath="..\..\src\xrc\xh_dirpicker.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_filepicker.cpp"/>
+				RelativePath="..\..\src\xrc\xh_dlg.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_fontpicker.cpp"/>
+				RelativePath="..\..\src\xrc\xh_filepicker.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_frame.cpp"/>
+				RelativePath="..\..\src\xrc\xh_fontpicker.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_gauge.cpp"/>
+				RelativePath="..\..\src\xrc\xh_frame.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_gdctl.cpp"/>
+				RelativePath="..\..\src\xrc\xh_gauge.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_grid.cpp"/>
+				RelativePath="..\..\src\xrc\xh_gdctl.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_html.cpp"/>
+				RelativePath="..\..\src\xrc\xh_grid.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_htmllbox.cpp"/>
+				RelativePath="..\..\src\xrc\xh_html.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_hyperlink.cpp"/>
+				RelativePath="..\..\src\xrc\xh_htmllbox.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_listb.cpp"/>
+				RelativePath="..\..\src\xrc\xh_hyperlink.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_listbk.cpp"/>
+				RelativePath="..\..\src\xrc\xh_listb.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_listc.cpp"/>
+				RelativePath="..\..\src\xrc\xh_listbk.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_mdi.cpp"/>
+				RelativePath="..\..\src\xrc\xh_listc.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_menu.cpp"/>
+				RelativePath="..\..\src\xrc\xh_mdi.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_notbk.cpp"/>
+				RelativePath="..\..\src\xrc\xh_menu.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_odcombo.cpp"/>
+				RelativePath="..\..\src\xrc\xh_notbk.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_panel.cpp"/>
+				RelativePath="..\..\src\xrc\xh_odcombo.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_propdlg.cpp"/>
+				RelativePath="..\..\src\xrc\xh_panel.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\xrc\xh_propdlg.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\xrc\xh_radbt.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_radbt.cpp"/>
+				RelativePath="..\..\src\xrc\xh_radbx.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_radbx.cpp"/>
+				RelativePath="..\..\src\xrc\xh_scrol.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_scrol.cpp"/>
+				RelativePath="..\..\src\xrc\xh_scwin.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_scwin.cpp"/>
+				RelativePath="..\..\src\xrc\xh_sizer.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_sizer.cpp"/>
+				RelativePath="..\..\src\xrc\xh_slidr.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_slidr.cpp"/>
+				RelativePath="..\..\src\xrc\xh_spin.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_spin.cpp"/>
+				RelativePath="..\..\src\xrc\xh_split.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_split.cpp"/>
+				RelativePath="..\..\src\xrc\xh_srchctrl.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_srchctrl.cpp"/>
+				RelativePath="..\..\src\xrc\xh_statbar.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_statbar.cpp"/>
+				RelativePath="..\..\src\xrc\xh_stbmp.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_stbmp.cpp"/>
+				RelativePath="..\..\src\xrc\xh_stbox.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_stbox.cpp"/>
+				RelativePath="..\..\src\xrc\xh_stlin.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_stlin.cpp"/>
+				RelativePath="..\..\src\xrc\xh_sttxt.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_sttxt.cpp"/>
+				RelativePath="..\..\src\xrc\xh_text.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_text.cpp"/>
+				RelativePath="..\..\src\xrc\xh_tglbtn.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_tglbtn.cpp"/>
+				RelativePath="..\..\src\xrc\xh_toolb.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_toolb.cpp"/>
+				RelativePath="..\..\src\xrc\xh_tree.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_tree.cpp"/>
+				RelativePath="..\..\src\xrc\xh_treebk.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_treebk.cpp"/>
+				RelativePath="..\..\src\xrc\xh_unkwn.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_unkwn.cpp"/>
+				RelativePath="..\..\src\xrc\xh_wizrd.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_wizrd.cpp"/>
+				RelativePath="..\..\src\xrc\xmladv.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xmlres.cpp"/>
+				RelativePath="..\..\src\xrc\xmlres.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\xrc\xmlrsall.cpp"/>
+				RelativePath="..\..\src\xrc\xmlrsall.cpp">
+			</File>
 		</Filter>
 	</Files>
 	<Globals>