X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7880889720de18a19e58653cb3b07da99053e7db..9e1da4827a0ec18f9766d664b9af12c25e3f71fb:/build/msw/wx_vc7_core.vcproj

diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj
index 443eedcf0d..72822b633d 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.7 (http://www.bakefile.org)
+  Bakefile 0.2.9 (http://www.bakefile.org)
   Do not modify, all changes will be overwritten!
 
 -->
@@ -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
@@ -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
@@ -273,7 +273,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_coredll.pch"
 				ObjectFile="vc_mswuddll\core\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw291ud_core_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw295ud_core_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -284,13 +284,13 @@
 				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\wxmsw291ud_core_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw295ud_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\wxmsw291ud_core_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw295ud_core_vc_custom.pdb"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -304,7 +304,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw291ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295ud_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\wxmsw291u_core_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw295u_core_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -349,19 +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\wxmsw291u_core_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw295u_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\wxmsw291u_core_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw295u_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"/>
@@ -371,7 +371,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw291u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295u_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
@@ -408,7 +408,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswunivuddll\wxprec_coredll.pch"
 				ObjectFile="vc_mswunivuddll\core\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv291ud_core_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv295ud_core_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -419,13 +419,13 @@
 				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\wxmswuniv291ud_core_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmswuniv295ud_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\wxmswuniv291ud_core_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv295ud_core_vc_custom.pdb"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -439,7 +439,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv291ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv295ud_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
@@ -465,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"
@@ -473,7 +473,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswunivudll\wxprec_coredll.pch"
 				ObjectFile="vc_mswunivudll\core\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv291u_core_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv295u_core_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -484,19 +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\wxmswuniv291u_core_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmswuniv295u_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\wxmswuniv291u_core_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv295u_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"/>
@@ -506,7 +506,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv291u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv295u_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
@@ -534,6 +534,9 @@
 			<File
 				RelativePath="..\..\src\common\accesscmn.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\common\affinematrix2d.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\anidecod.cpp">
 			</File>
@@ -546,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>
@@ -558,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>
@@ -576,6 +591,9 @@
 			<File
 				RelativePath="..\..\src\common\colourcmn.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\common\colourdata.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\combocmn.cpp">
 			</File>
@@ -591,9 +609,6 @@
 			<File
 				RelativePath="..\..\src\common\ctrlsub.cpp">
 			</File>
-			<File
-				RelativePath="..\..\src\common\datacmn.cpp">
-			</File>
 			<File
 				RelativePath="..\..\src\common\dcbase.cpp">
 			</File>
@@ -606,6 +621,9 @@
 			<File
 				RelativePath="..\..\src\common\dcsvg.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\common\dirctrlcmn.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\dlgcmn.cpp">
 			</File>
@@ -690,6 +708,9 @@
 			<File
 				RelativePath="..\..\src\common\filectrlcmn.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\common\filehistorycmn.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\filepickercmn.cpp">
 			</File>
@@ -699,6 +720,9 @@
 			<File
 				RelativePath="..\..\src\common\fontcmn.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\common\fontdata.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\fontenumcmn.cpp">
 			</File>
@@ -795,6 +819,9 @@
 			<File
 				RelativePath="..\..\src\common\listctrlcmn.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\common\markupparser.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\matrix.cpp">
 			</File>
@@ -813,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>
@@ -831,6 +864,9 @@
 			<File
 				RelativePath="..\..\src\common\quantize.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\common\radiobtncmn.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\radiocmn.cpp">
 			</File>
@@ -843,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>
@@ -858,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>
@@ -873,12 +927,18 @@
 			<File
 				RelativePath="..\..\src\common\textentrycmn.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\common\textmeasurecmn.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\toplvcmn.cpp">
 			</File>
 			<File
 				RelativePath="..\..\src\common\treebase.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\common\uiactioncmn.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\utilscmn.cpp">
 			</File>
@@ -888,6 +948,9 @@
 			<File
 				RelativePath="..\..\src\common\validate.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\common\valnum.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\valtext.cpp">
 			</File>
@@ -964,6 +1027,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>
@@ -1819,6 +1897,9 @@
 					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
+			<File
+				RelativePath="..\..\src\msw\nonownedwnd.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\msw\notebook.cpp">
 				<FileConfiguration
@@ -1879,6 +1960,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>
@@ -1891,6 +1987,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
@@ -1975,6 +2086,24 @@
 			<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\ole\safearray.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\msw\scrolbar.cpp">
 				<FileConfiguration
@@ -2335,6 +2464,9 @@
 					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
+			<File
+				RelativePath="..\..\src\msw\textmeasure.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\msw\tglbtn.cpp">
 				<FileConfiguration
@@ -2434,9 +2566,15 @@
 					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
+			<File
+				RelativePath="..\..\src\msw\uiaction.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\msw\utilsgui.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\msw\utilswin.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\msw\ole\uuid.cpp">
 			</File>
@@ -2645,9 +2783,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>
@@ -2693,6 +2837,9 @@
 			<File
 				RelativePath="..\..\src\generic\logg.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\generic\markuptext.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\generic\mdig.cpp">
 				<FileConfiguration
@@ -2710,25 +2857,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>
@@ -2741,6 +2873,9 @@
 			<File
 				RelativePath="..\..\src\generic\renderg.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\generic\richmsgdlgg.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\generic\scrlwing.cpp">
 			</File>
@@ -4038,8 +4173,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">
@@ -4047,8 +4181,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"/>
@@ -4060,8 +4193,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">
@@ -4069,8 +4201,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"/>
@@ -4089,8 +4220,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">
@@ -4098,8 +4228,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"/>
@@ -4111,8 +4240,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">
@@ -4120,8 +4248,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>
@@ -4137,6 +4264,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>
@@ -4188,6 +4318,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>
@@ -4197,6 +4330,9 @@
 			<File
 				RelativePath="..\..\include\wx\msw\cursor.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\custombgwin.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\ole\dataform.h">
 			</File>
@@ -4209,6 +4345,9 @@
 			<File
 				RelativePath="..\..\include\wx\msw\datectrl.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\datetimectrl.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\dc.h">
 			</File>
@@ -4362,6 +4501,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>
@@ -4371,6 +4513,9 @@
 			<File
 				RelativePath="..\..\include\wx\msw\iniconf.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\init.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\joystick.h">
 			</File>
@@ -4404,6 +4549,9 @@
 			<File
 				RelativePath="..\..\include\wx\msw\msvcrt.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\nonownedwnd.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\notebook.h">
 			</File>
@@ -4413,9 +4561,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>
@@ -4428,6 +4582,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>
@@ -4441,10 +4598,13 @@
 				RelativePath="..\..\include\wx\msw\region.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\scrolbar.h">
+				RelativePath="..\..\include\wx\msw\richmsgdlg.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\setup0.h">
+				RelativePath="..\..\include\wx\msw\ole\safearray.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\scrolbar.h">
 			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\slider.h">
@@ -4485,6 +4645,9 @@
 			<File
 				RelativePath="..\..\include\wx\msw\tglbtn.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\timectrl.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\toolbar.h">
 			</File>
@@ -4506,6 +4669,15 @@
 			<File
 				RelativePath="..\..\include\wx\msw\uxthemep.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\webview_ie.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\webview_missing.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\webviewhistoryitem_ie.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\window.h">
 			</File>
@@ -4552,6 +4724,9 @@
 			<File
 				RelativePath="..\..\include\wx\generic\ctrlsub.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\custombgwin.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\dataview.h">
 			</File>
@@ -4570,6 +4745,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>
@@ -4651,6 +4832,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>
@@ -4681,6 +4865,9 @@
 			<File
 				RelativePath="..\..\include\wx\generic\textdlgg.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\timectrl.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\treectlg.h">
 			</File>
@@ -4691,6 +4878,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>
@@ -4721,6 +4911,9 @@
 			<File
 				RelativePath="..\..\include\wx\univ\control.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\univ\custombgwin.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\univ\dialog.h">
 			</File>
@@ -4748,6 +4941,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>
@@ -4857,6 +5053,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>
@@ -4876,6 +5075,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>
@@ -4885,6 +5090,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>
@@ -4897,6 +5111,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>
@@ -4907,10 +5127,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">
@@ -4921,6 +5141,9 @@
 			<File
 				RelativePath="..\..\include\wx\button.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\ribbon\buttonbar.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\cairo.h">
 			</File>
@@ -4966,15 +5189,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>
@@ -4984,6 +5219,9 @@
 			<File
 				RelativePath="..\..\include\wx\cursor.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\custombgwin.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\dataobj.h">
 			</File>
@@ -4996,6 +5234,9 @@
 			<File
 				RelativePath="..\..\include\wx\dateevt.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\datetimectrl.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\dc.h">
 			</File>
@@ -5062,6 +5303,9 @@
 			<File
 				RelativePath="..\..\include\wx\dragimag.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\dvrenderers.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\editlbox.h">
 			</File>
@@ -5074,9 +5318,6 @@
 			<File
 				RelativePath="..\..\include\wx\encinfo.h">
 			</File>
-			<File
-				RelativePath="..\..\include\wx\evtloop.h">
-			</File>
 			<File
 				RelativePath="..\..\include\wx\evtloopsrc.h">
 			</File>
@@ -5089,6 +5330,9 @@
 			<File
 				RelativePath="..\..\include\wx\filedlg.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\filehistory.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\filepicker.h">
 			</File>
@@ -5101,6 +5345,9 @@
 			<File
 				RelativePath="..\..\include\wx\font.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\fontdata.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\fontdlg.h">
 			</File>
@@ -5119,6 +5366,9 @@
 			<File
 				RelativePath="..\..\include\wx\aui\framemanager.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\ribbon\gallery.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\gauge.h">
 			</File>
@@ -5215,6 +5465,9 @@
 			<File
 				RelativePath="..\..\include\wx\infobar.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\itemid.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\joystick.h">
 			</File>
@@ -5290,12 +5543,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>
@@ -5356,6 +5615,9 @@
 			<File
 				RelativePath="..\..\include\wx\radiobut.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\range.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\rawbmp.h">
 			</File>
@@ -5368,33 +5630,78 @@
 			<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\richtexttabspage.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>
@@ -5413,6 +5720,9 @@
 			<File
 				RelativePath="..\..\include\wx\settings.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\simplebook.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\sizer.h">
 			</File>
@@ -5431,6 +5741,9 @@
 			<File
 				RelativePath="..\..\include\wx\splash.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\persist\splitter.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\splitter.h">
 			</File>
@@ -5455,6 +5768,9 @@
 			<File
 				RelativePath="..\..\include\wx\stc\stc.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\aui\tabart.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\aui\tabmdi.h">
 			</File>
@@ -5464,6 +5780,9 @@
 			<File
 				RelativePath="..\..\include\wx\tbarbase.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\textcompleter.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\textctrl.h">
 			</File>
@@ -5479,12 +5798,18 @@
 			<File
 				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>
@@ -5495,29 +5820,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>
@@ -5534,14 +5868,26 @@
 				RelativePath="..\..\include\wx\vscroll.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\window.h">
+				RelativePath="..\..\include\wx\webview.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\webviewarchivehandler.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\webviewfshandler.h">
 			</File>
 			<File
 				RelativePath="..\..\include\wx\persist\window.h">
 			</File>
+			<File
+				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>
@@ -5560,6 +5906,12 @@
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_animatctrl.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_auinotbk.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_bannerwindow.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_bmp.h">
 			</File>
@@ -5590,6 +5942,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>
@@ -5674,6 +6029,12 @@
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_radbx.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_ribbon.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_richtext.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_scrol.h">
 			</File>
@@ -5716,9 +6077,15 @@
 			<File
 				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>
@@ -5734,6 +6101,9 @@
 			<File
 				RelativePath="..\..\include\wx\xrc\xmlres.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xmlreshandler.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xpmdecod.h">
 			</File>
@@ -5741,6 +6111,14 @@
 				RelativePath="..\..\include\wx\xpmhand.h">
 			</File>
 		</Filter>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath="..\..\src\xrc\xmlreshandler.cpp">
+			</File>
+		</Filter>
 	</Files>
 	<Globals>