X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/adcda299c06800fedaf2436bcf4c8759905a4502..9a237e2f12b18f75b2602052dedeee5650180a7c:/build/msw/wx_vc7_core.vcproj?ds=inline

diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj
index 4ed4be8f38..c3d6cb292d 100644
--- a/build/msw/wx_vc7_core.vcproj
+++ b/build/msw/wx_vc7_core.vcproj
@@ -2,7 +2,7 @@
 <!--
 
   This project was generated by
-  Bakefile 0.2.6 (http://www.bakefile.org)
+  Bakefile 0.2.9 (http://www.bakefile.org)
   Do not modify, all changes will be overwritten!
 
 -->
@@ -28,7 +28,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
 				MinimalRebuild="TRUE"
 				ExceptionHandling="TRUE"
 				BasicRuntimeChecks="3"
@@ -52,7 +52,7 @@
 				SuppressStartupBanner="TRUE"/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
 				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
@@ -62,7 +62,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
@@ -88,7 +88,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
+				PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0"
 				ExceptionHandling="TRUE"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="TRUE"
@@ -109,7 +109,7 @@
 				SuppressStartupBanner="TRUE"/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
+				PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0"
 				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
@@ -119,7 +119,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
+				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
@@ -145,7 +145,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
 				MinimalRebuild="TRUE"
 				ExceptionHandling="TRUE"
 				BasicRuntimeChecks="3"
@@ -169,7 +169,7 @@
 				SuppressStartupBanner="TRUE"/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
 				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
@@ -179,7 +179,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
@@ -205,7 +205,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
+				PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0"
 				ExceptionHandling="TRUE"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="TRUE"
@@ -226,7 +226,7 @@
 				SuppressStartupBanner="TRUE"/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
+				PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0"
 				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
@@ -236,7 +236,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
+				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
@@ -262,7 +262,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
 				MinimalRebuild="TRUE"
 				ExceptionHandling="TRUE"
 				BasicRuntimeChecks="3"
@@ -273,7 +273,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_coredll.pch"
 				ObjectFile="vc_mswuddll\core\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_core_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -284,17 +284,17 @@
 				Name="VCLinkerTool"
 				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\wxbase29ud.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw293ud_core_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_core.lib"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_core_vc_custom.pdb"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
@@ -304,7 +304,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
@@ -330,7 +330,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
 				ExceptionHandling="TRUE"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="TRUE"
@@ -338,7 +338,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_coredll.pch"
 				ObjectFile="vc_mswudll\core\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_core_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -349,17 +349,19 @@
 				Name="VCLinkerTool"
 				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\wxbase29u.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw290u_core_vc_custom.dll"
-				LinkIncremental="2"
+				OutputFile="..\..\lib\vc_dll\wxmsw293u_core_vc_custom.dll"
+				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw29u_core.lib"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb"
-				TargetMachine="1"/>
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_core_vc_custom.pdb"
+				TargetMachine="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
@@ -369,7 +371,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
@@ -395,7 +397,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
 				MinimalRebuild="TRUE"
 				ExceptionHandling="TRUE"
 				BasicRuntimeChecks="3"
@@ -406,7 +408,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswunivuddll\wxprec_coredll.pch"
 				ObjectFile="vc_mswunivuddll\core\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_core_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -417,17 +419,17 @@
 				Name="VCLinkerTool"
 				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\wxbase29ud.lib"
-				OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_core_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_core.lib"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_core_vc_custom.pdb"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
@@ -437,7 +439,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
@@ -463,7 +465,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
 				ExceptionHandling="TRUE"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="TRUE"
@@ -471,7 +473,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswunivudll\wxprec_coredll.pch"
 				ObjectFile="vc_mswunivudll\core\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_core_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -482,17 +484,19 @@
 				Name="VCLinkerTool"
 				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\wxbase29u.lib"
-				OutputFile="..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.dll"
-				LinkIncremental="2"
+				OutputFile="..\..\lib\vc_dll\wxmswuniv293u_core_vc_custom.dll"
+				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_core.lib"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb"
-				TargetMachine="1"/>
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_core_vc_custom.pdb"
+				TargetMachine="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
@@ -502,7 +506,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
@@ -530,6 +534,9 @@
 			<File
 				RelativePath="..\..\src\common\accesscmn.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\common\affinematrix2d.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\anidecod.cpp">
 			</File>
@@ -542,9 +549,15 @@
 			<File
 				RelativePath="..\..\src\common\artstd.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\common\arttango.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\bmpbase.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\common\bmpbtncmn.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\bookctrl.cpp">
 			</File>
@@ -554,6 +567,12 @@
 			<File
 				RelativePath="..\..\src\common\cairo.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\common\checkboxcmn.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\common\checklstcmn.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\choiccmn.cpp">
 			</File>
@@ -572,6 +591,9 @@
 			<File
 				RelativePath="..\..\src\common\colourcmn.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\common\colourdata.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\combocmn.cpp">
 			</File>
@@ -587,9 +609,6 @@
 			<File
 				RelativePath="..\..\src\common\ctrlsub.cpp">
 			</File>
-			<File
-				RelativePath="..\..\src\common\datacmn.cpp">
-			</File>
 			<File
 				RelativePath="..\..\src\common\dcbase.cpp">
 			</File>
@@ -602,6 +621,9 @@
 			<File
 				RelativePath="..\..\src\common\dcsvg.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\common\dirctrlcmn.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\dlgcmn.cpp">
 			</File>
@@ -686,6 +708,9 @@
 			<File
 				RelativePath="..\..\src\common\filectrlcmn.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\common\filehistorycmn.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\filepickercmn.cpp">
 			</File>
@@ -695,6 +720,9 @@
 			<File
 				RelativePath="..\..\src\common\fontcmn.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\common\fontdata.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\fontenumcmn.cpp">
 			</File>
@@ -791,6 +819,9 @@
 			<File
 				RelativePath="..\..\src\common\listctrlcmn.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\common\markupparser.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\matrix.cpp">
 			</File>
@@ -809,6 +840,12 @@
 			<File
 				RelativePath="..\..\src\common\overlaycmn.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\common\ownerdrwcmn.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\common\panelcmn.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\paper.cpp">
 			</File>
@@ -827,6 +864,9 @@
 			<File
 				RelativePath="..\..\src\common\quantize.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\common\radiobtncmn.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\radiocmn.cpp">
 			</File>
@@ -839,12 +879,21 @@
 			<File
 				RelativePath="..\..\src\common\rgncmn.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\common\scrolbarcmn.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\settcmn.cpp">
 			</File>
 			<File
 				RelativePath="..\..\src\common\sizer.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\common\slidercmn.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\common\spinbtncmn.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\spinctrlcmn.cpp">
 			</File>
@@ -854,6 +903,15 @@
 			<File
 				RelativePath="..\..\src\common\statbar.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\common\statbmpcmn.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\common\statboxcmn.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\common\statlinecmn.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\stattextcmn.cpp">
 			</File>
@@ -875,6 +933,9 @@
 			<File
 				RelativePath="..\..\src\common\treebase.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\common\uiactioncmn.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\utilscmn.cpp">
 			</File>
@@ -884,6 +945,9 @@
 			<File
 				RelativePath="..\..\src\common\validate.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\common\valnum.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\valtext.cpp">
 			</File>
@@ -960,6 +1024,21 @@
 			<File
 				RelativePath="..\..\src\msw\ole\activex.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\msw\anybutton.cpp">
+				<FileConfiguration
+					Name="Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\app.cpp">
 			</File>
@@ -1816,6 +1895,9 @@
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
+				RelativePath="..\..\src\msw\nonownedwnd.cpp">
+			</File>
+			<File
 				RelativePath="..\..\src\msw\notebook.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
@@ -1875,6 +1957,21 @@
 			<File
 				RelativePath="..\..\src\msw\palette.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\msw\panel.cpp">
+				<FileConfiguration
+					Name="Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\pen.cpp">
 			</File>
@@ -1887,6 +1984,21 @@
 			<File
 				RelativePath="..\..\src\msw\printwin.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\msw\progdlg.cpp">
+				<FileConfiguration
+					Name="Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\radiobox.cpp">
 				<FileConfiguration
@@ -1971,6 +2083,21 @@
 			<File
 				RelativePath="..\..\src\msw\renderer.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\msw\richmsgdlg.cpp">
+				<FileConfiguration
+					Name="Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\scrolbar.cpp">
 				<FileConfiguration
@@ -2430,6 +2557,9 @@
 					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
+			<File
+				RelativePath="..\..\src\msw\uiaction.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\msw\utilsgui.cpp">
 			</File>
@@ -2641,9 +2771,15 @@
 			<File
 				RelativePath="..\..\src\generic\fontpickerg.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\generic\graphicc.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\generic\headerctrlg.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\generic\infobar.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\generic\listbkg.cpp">
 			</File>
@@ -2689,6 +2825,9 @@
 			<File
 				RelativePath="..\..\src\generic\logg.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\generic\markuptext.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\generic\mdig.cpp">
 				<FileConfiguration
@@ -2706,25 +2845,10 @@
 			</File>
 			<File
 				RelativePath="..\..\src\generic\msgdlgg.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="TRUE"/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
 				RelativePath="..\..\src\generic\numdlgg.cpp">
 			</File>
-			<File
-				RelativePath="..\..\src\generic\panelg.cpp">
-			</File>
 			<File
 				RelativePath="..\..\src\generic\printps.cpp">
 			</File>
@@ -2737,6 +2861,9 @@
 			<File
 				RelativePath="..\..\src\generic\renderg.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\generic\richmsgdlgg.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\generic\scrlwing.cpp">
 			</File>
@@ -4034,8 +4161,7 @@
 						Name="VCCustomBuildTool"
 						Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"
 						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswud\wx\setup.h"
-						Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"
-						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
+						Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|Win32">
@@ -4043,8 +4169,7 @@
 						Name="VCCustomBuildTool"
 						Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"
 						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswu\wx\setup.h"
-						Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"
-						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
+						Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Universal Debug|Win32"/>
@@ -4056,8 +4181,7 @@
 						Name="VCCustomBuildTool"
 						Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h"
 						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswud\wx\setup.h"
-						Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"
-						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
+						Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="DLL Release|Win32">
@@ -4065,8 +4189,7 @@
 						Name="VCCustomBuildTool"
 						Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h"
 						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswu\wx\setup.h"
-						Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"
-						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
+						Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="DLL Universal Debug|Win32"/>
@@ -4085,8 +4208,7 @@
 						Name="VCCustomBuildTool"
 						Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h"
 						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivud\wx\setup.h"
-						Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"
-						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
+						Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Universal Release|Win32">
@@ -4094,8 +4216,7 @@
 						Name="VCCustomBuildTool"
 						Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h"
 						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivu\wx\setup.h"
-						Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"
-						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
+						Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="DLL Debug|Win32"/>
@@ -4107,8 +4228,7 @@
 						Name="VCCustomBuildTool"
 						Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h"
 						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivud\wx\setup.h"
-						Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"
-						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
+						Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="DLL Universal Release|Win32">
@@ -4116,8 +4236,7 @@
 						Name="VCCustomBuildTool"
 						Description="Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h"
 						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivu\wx\setup.h"
-						Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"
-						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
+						Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"/>
 				</FileConfiguration>
 			</File>
 		</Filter>
@@ -4133,6 +4252,9 @@
 			<File
 				RelativePath="..\..\include\wx\msw\ole\activex.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\anybutton.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\app.h">
 			</File>
@@ -4184,6 +4306,9 @@
 			<File
 				RelativePath="..\..\include\wx\msw\combobox.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\commandlinkbutton.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\control.h">
 			</File>
@@ -4194,6 +4319,9 @@
 				RelativePath="..\..\include\wx\msw\cursor.h">
 			</File>
 			<File
+				RelativePath="..\..\include\wx\msw\custombgwin.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\msw\ole\dataform.h">
 			</File>
 			<File
@@ -4206,6 +4334,9 @@
 				RelativePath="..\..\include\wx\msw\datectrl.h">
 			</File>
 			<File
+				RelativePath="..\..\include\wx\msw\datetimectrl.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\msw\dc.h">
 			</File>
 			<File
@@ -4358,6 +4489,9 @@
 			<File
 				RelativePath="..\..\include\wx\msw\htmlhelp.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\hyperlink.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\icon.h">
 			</File>
@@ -4401,6 +4535,9 @@
 				RelativePath="..\..\include\wx\msw\msvcrt.h">
 			</File>
 			<File
+				RelativePath="..\..\include\wx\msw\nonownedwnd.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\msw\notebook.h">
 			</File>
 			<File
@@ -4409,9 +4546,15 @@
 			<File
 				RelativePath="..\..\include\wx\msw\ole\oleutils.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\ownerdrw.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\palette.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\panel.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\pen.h">
 			</File>
@@ -4424,6 +4567,9 @@
 			<File
 				RelativePath="..\..\include\wx\msw\printwin.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\progdlg.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\radiobox.h">
 			</File>
@@ -4436,6 +4582,9 @@
 			<File
 				RelativePath="..\..\include\wx\msw\region.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\richmsgdlg.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\scrolbar.h">
 			</File>
@@ -4482,6 +4631,9 @@
 				RelativePath="..\..\include\wx\msw\tglbtn.h">
 			</File>
 			<File
+				RelativePath="..\..\include\wx\msw\timectrl.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\msw\toolbar.h">
 			</File>
 			<File
@@ -4549,6 +4701,9 @@
 				RelativePath="..\..\include\wx\generic\ctrlsub.h">
 			</File>
 			<File
+				RelativePath="..\..\include\wx\generic\custombgwin.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\generic\dataview.h">
 			</File>
 			<File
@@ -4566,6 +4721,12 @@
 			<File
 				RelativePath="..\..\include\wx\generic\dragimgg.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\dvrenderer.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\dvrenderers.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\fdrepdlg.h">
 			</File>
@@ -4605,6 +4766,9 @@
 			<File
 				RelativePath="..\..\include\wx\generic\hyperlink.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\infobar.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\laywin.h">
 			</File>
@@ -4644,6 +4808,9 @@
 			<File
 				RelativePath="..\..\include\wx\generic\propdlg.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\richmsgdlgg.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\sashwin.h">
 			</File>
@@ -4675,6 +4842,9 @@
 				RelativePath="..\..\include\wx\generic\textdlgg.h">
 			</File>
 			<File
+				RelativePath="..\..\include\wx\generic\timectrl.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\generic\treectlg.h">
 			</File>
 			<File
@@ -4684,6 +4854,9 @@
 		<Filter
 			Name="wxUniv Headers"
 			UniqueIdentifier="{46168D7C-2783-50F3-AE9D-A740D5FF0B44}">
+			<File
+				RelativePath="..\..\include\wx\univ\anybutton.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\univ\app.h">
 			</File>
@@ -4715,6 +4888,9 @@
 				RelativePath="..\..\include\wx\univ\control.h">
 			</File>
 			<File
+				RelativePath="..\..\include\wx\univ\custombgwin.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\univ\dialog.h">
 			</File>
 			<File
@@ -4741,6 +4917,9 @@
 			<File
 				RelativePath="..\..\include\wx\univ\notebook.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\univ\panel.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\univ\radiobox.h">
 			</File>
@@ -4850,6 +5029,9 @@
 			<File
 				RelativePath="..\..\include\wx\html\m_templ.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\html\styleparams.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\html\winpars.h">
 			</File>
@@ -4869,6 +5051,12 @@
 			<File
 				RelativePath="..\..\include\wx\propgrid\advprops.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\affinematrix2d.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\affinematrix2dbase.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\anidecod.h">
 			</File>
@@ -4878,6 +5066,15 @@
 			<File
 				RelativePath="..\..\include\wx\animdecod.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\anybutton.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\ribbon\art.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\ribbon\art_internal.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\artprov.h">
 			</File>
@@ -4890,6 +5087,12 @@
 			<File
 				RelativePath="..\..\include\wx\aui\auibook.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\bannerwindow.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\ribbon\bar.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\bitmap.h">
 			</File>
@@ -4900,10 +5103,10 @@
 				RelativePath="..\..\include\wx\bmpcbox.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\persist\bookctrl.h">
+				RelativePath="..\..\include\wx\bookctrl.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\bookctrl.h">
+				RelativePath="..\..\include\wx\persist\bookctrl.h">
 			</File>
 			<File
 				RelativePath="..\..\include\wx\brush.h">
@@ -4914,6 +5117,9 @@
 			<File
 				RelativePath="..\..\include\wx\button.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\ribbon\buttonbar.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\cairo.h">
 			</File>
@@ -4959,15 +5165,27 @@
 			<File
 				RelativePath="..\..\include\wx\colour.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\colourdata.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\combo.h">
 			</File>
 			<File
 				RelativePath="..\..\include\wx\combobox.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\commandlinkbutton.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\compositewin.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\control.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\ribbon\control.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\cshelp.h">
 			</File>
@@ -4978,6 +5196,9 @@
 				RelativePath="..\..\include\wx\cursor.h">
 			</File>
 			<File
+				RelativePath="..\..\include\wx\custombgwin.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\dataobj.h">
 			</File>
 			<File
@@ -5055,6 +5276,9 @@
 			<File
 				RelativePath="..\..\include\wx\dragimag.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\dvrenderers.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\editlbox.h">
 			</File>
@@ -5068,7 +5292,7 @@
 				RelativePath="..\..\include\wx\encinfo.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\evtloop.h">
+				RelativePath="..\..\include\wx\evtloopsrc.h">
 			</File>
 			<File
 				RelativePath="..\..\include\wx\fdrepdlg.h">
@@ -5079,6 +5303,9 @@
 			<File
 				RelativePath="..\..\include\wx\filedlg.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\filehistory.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\filepicker.h">
 			</File>
@@ -5091,6 +5318,9 @@
 			<File
 				RelativePath="..\..\include\wx\font.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\fontdata.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\fontdlg.h">
 			</File>
@@ -5109,6 +5339,9 @@
 			<File
 				RelativePath="..\..\include\wx\aui\framemanager.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\ribbon\gallery.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\gauge.h">
 			</File>
@@ -5202,6 +5435,12 @@
 			<File
 				RelativePath="..\..\include\wx\imagxpm.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\infobar.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\itemid.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\joystick.h">
 			</File>
@@ -5277,12 +5516,18 @@
 			<File
 				RelativePath="..\..\include\wx\ownerdrw.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\ribbon\page.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\palette.h">
 			</File>
 			<File
 				RelativePath="..\..\include\wx\panel.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\ribbon\panel.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\paper.h">
 			</File>
@@ -5343,6 +5588,9 @@
 			<File
 				RelativePath="..\..\include\wx\radiobut.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\range.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\rawbmp.h">
 			</File>
@@ -5355,34 +5603,76 @@
 			<File
 				RelativePath="..\..\include\wx\renderer.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\richmsgdlg.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\richtext\richtextbackgroundpage.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\richtext\richtextborderspage.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\richtext\richtextbuffer.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\richtext\richtextbulletspage.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\richtext\richtextctrl.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\richtext\richtextdialogpage.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\richtext\richtextfontpage.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\richtext\richtextformatdlg.h">
 			</File>
 			<File
 				RelativePath="..\..\include\wx\richtext\richtexthtml.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\richtext\richtextimagedlg.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\richtext\richtextindentspage.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\richtext\richtextliststylepage.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\richtext\richtextmarginspage.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\richtext\richtextprint.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\richtext\richtextsizepage.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\richtext\richtextstyledlg.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\richtext\richtextstylepage.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\richtext\richtextstyles.h">
 			</File>
 			<File
 				RelativePath="..\..\include\wx\richtext\richtextsymboldlg.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\richtext\richtextuicustomization.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\richtext\richtextxml.h">
 			</File>
 			<File
+				RelativePath="..\..\include\wx\richtooltip.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\sashwin.h">
 			</File>
 			<File
@@ -5418,6 +5708,9 @@
 			<File
 				RelativePath="..\..\include\wx\splash.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\persist\splitter.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\splitter.h">
 			</File>
@@ -5451,6 +5744,9 @@
 			<File
 				RelativePath="..\..\include\wx\tbarbase.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\textcompleter.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\textctrl.h">
 			</File>
@@ -5467,11 +5763,17 @@
 				RelativePath="..\..\include\wx\tglbtn.h">
 			</File>
 			<File
+				RelativePath="..\..\include\wx\timectrl.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\tipdlg.h">
 			</File>
 			<File
 				RelativePath="..\..\include\wx\tipwin.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\ribbon\toolbar.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\toolbar.h">
 			</File>
@@ -5482,29 +5784,38 @@
 				RelativePath="..\..\include\wx\tooltip.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\toplevel.h">
+				RelativePath="..\..\include\wx\persist\toplevel.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\persist\toplevel.h">
+				RelativePath="..\..\include\wx\toplevel.h">
 			</File>
 			<File
 				RelativePath="..\..\include\wx\treebase.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\treebook.h">
+				RelativePath="..\..\include\wx\persist\treebook.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\persist\treebook.h">
+				RelativePath="..\..\include\wx\treebook.h">
 			</File>
 			<File
 				RelativePath="..\..\include\wx\treectrl.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\treelist.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\uiaction.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\valgen.h">
 			</File>
 			<File
 				RelativePath="..\..\include\wx\validate.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\valnum.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\valtext.h">
 			</File>
@@ -5521,14 +5832,17 @@
 				RelativePath="..\..\include\wx\vscroll.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\window.h">
+				RelativePath="..\..\include\wx\persist\window.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\persist\window.h">
+				RelativePath="..\..\include\wx\window.h">
 			</File>
 			<File
 				RelativePath="..\..\include\wx\windowid.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\withimages.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\wizard.h">
 			</File>
@@ -5547,6 +5861,9 @@
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_animatctrl.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_bannerwindow.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_bmp.h">
 			</File>
@@ -5577,6 +5894,9 @@
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_clrpicker.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_cmdlinkbn.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_collpane.h">
 			</File>
@@ -5598,6 +5918,9 @@
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_editlbox.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_filectrl.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_filepicker.h">
 			</File>
@@ -5701,8 +6024,14 @@
 				RelativePath="..\..\include\wx\xrc\xh_tglbtn.h">
 			</File>
 			<File
+				RelativePath="..\..\include\wx\xrc\xh_timectrl.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\xrc\xh_toolb.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_toolbk.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_tree.h">
 			</File>