X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/59068d79f7fcc94d320cf41ce1ed7f0a8851b125..9e1da4827a0ec18f9766d664b9af12c25e3f71fb:/build/msw/wx_vc7_core.vcproj?ds=sidebyside

diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj
index 319379098d..72822b633d 100644
--- a/build/msw/wx_vc7_core.vcproj
+++ b/build/msw/wx_vc7_core.vcproj
@@ -273,7 +273,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_coredll.pch"
 				ObjectFile="vc_mswuddll\core\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_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\wxmsw293ud_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\wxmsw293ud_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=wxmsw293ud_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
@@ -338,7 +338,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_coredll.pch"
 				ObjectFile="vc_mswudll\core\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_core_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw295u_core_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -349,13 +349,13 @@
 				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\wxmsw293u_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\wxmsw293u_core_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw295u_core_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"/>
@@ -371,7 +371,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_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\wxmswuniv293ud_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\wxmswuniv293ud_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\wxmswuniv293ud_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=wxmswuniv293ud_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
@@ -473,7 +473,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswunivudll\wxprec_coredll.pch"
 				ObjectFile="vc_mswunivudll\core\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_core_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv295u_core_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -484,13 +484,13 @@
 				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\wxmswuniv293u_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\wxmswuniv293u_core_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv295u_core_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"/>
@@ -506,7 +506,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_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
@@ -927,6 +927,9 @@
 			<File
 				RelativePath="..\..\src\common\textentrycmn.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\common\textmeasurecmn.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\toplvcmn.cpp">
 			</File>
@@ -1889,21 +1892,21 @@
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="DLL Universal Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
-				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\msw\nonownedwnd.cpp">
-			</File>
-			<File
-				RelativePath="..\..\src\msw\notebook.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswud\core\msw_notebook.obj"/>
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\nonownedwnd.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\msw\notebook.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_notebook.obj"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|Win32">
@@ -2098,6 +2101,9 @@
 					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
+			<File
+				RelativePath="..\..\src\msw\ole\safearray.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\msw\scrolbar.cpp">
 				<FileConfiguration
@@ -2458,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
@@ -2563,6 +2572,9 @@
 			<File
 				RelativePath="..\..\src\msw\utilsgui.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\msw\utilswin.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\msw\ole\uuid.cpp">
 			</File>
@@ -4313,36 +4325,36 @@
 				RelativePath="..\..\include\wx\msw\control.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\ctrlsub.h">
-			</File>
-			<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>
-			<File
-				RelativePath="..\..\include\wx\msw\ole\dataobj.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\ole\dataobj2.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\datectrl.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\datetimectrl.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\dc.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\dcclient.h">
-			</File>
-			<File
+				RelativePath="..\..\include\wx\msw\ctrlsub.h">
+			</File>
+			<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>
+			<File
+				RelativePath="..\..\include\wx\msw\ole\dataobj.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\ole\dataobj2.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\datectrl.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\datetimectrl.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\dc.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\dcclient.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\msw\dcmemory.h">
 			</File>
 			<File
@@ -4501,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>
@@ -4529,21 +4544,21 @@
 				RelativePath="..\..\include\wx\msw\missing.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\msgdlg.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\msvcrt.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\nonownedwnd.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\notebook.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\notifmsg.h">
-			</File>
-			<File
+				RelativePath="..\..\include\wx\msw\msgdlg.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\msvcrt.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\nonownedwnd.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\notebook.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\notifmsg.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\msw\ole\oleutils.h">
 			</File>
 			<File
@@ -4586,10 +4601,10 @@
 				RelativePath="..\..\include\wx\msw\richmsgdlg.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\scrolbar.h">
+				RelativePath="..\..\include\wx\msw\ole\safearray.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\setup0.h">
+				RelativePath="..\..\include\wx\msw\scrolbar.h">
 			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\slider.h">
@@ -4625,21 +4640,21 @@
 				RelativePath="..\..\include\wx\msw\textctrl.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\textentry.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\tglbtn.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\timectrl.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\toolbar.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\tooltip.h">
-			</File>
-			<File
+				RelativePath="..\..\include\wx\msw\textentry.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\tglbtn.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\timectrl.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\toolbar.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\tooltip.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\msw\toplevel.h">
 			</File>
 			<File
@@ -4655,12 +4670,15 @@
 				RelativePath="..\..\include\wx\msw\uxthemep.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\webview_ie.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\webviewhistoryitem_ie.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>
 		</Filter>
@@ -4701,21 +4719,21 @@
 				RelativePath="..\..\include\wx\generic\colrdlgg.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\generic\combo.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\ctrlsub.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\custombgwin.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\dataview.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\datectrl.h">
-			</File>
-			<File
+				RelativePath="..\..\include\wx\generic\combo.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\ctrlsub.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\custombgwin.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\dataview.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\datectrl.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\generic\dcpsg.h">
 			</File>
 			<File
@@ -4842,21 +4860,21 @@
 				RelativePath="..\..\include\wx\generic\stattextg.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\generic\statusbr.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\textdlgg.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\timectrl.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\treectlg.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\wizard.h">
-			</File>
-		</Filter>
+				RelativePath="..\..\include\wx\generic\statusbr.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\textdlgg.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\timectrl.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\treectlg.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\wizard.h">
+			</File>
+		</Filter>
 		<Filter
 			Name="wxUniv Headers"
 			UniqueIdentifier="{46168D7C-2783-50F3-AE9D-A740D5FF0B44}">
@@ -4888,21 +4906,21 @@
 				RelativePath="..\..\include\wx\univ\colschem.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\univ\combobox.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\univ\control.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\univ\custombgwin.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\univ\dialog.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\univ\frame.h">
-			</File>
-			<File
+				RelativePath="..\..\include\wx\univ\combobox.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\univ\control.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\univ\custombgwin.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\univ\dialog.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\univ\frame.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\univ\gauge.h">
 			</File>
 			<File
@@ -5196,36 +5214,36 @@
 				RelativePath="..\..\include\wx\cshelp.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\ctrlsub.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\cursor.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\custombgwin.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\dataobj.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\dataview.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\datectrl.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\dateevt.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\datetimectrl.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\dc.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\dcbuffer.h">
-			</File>
-			<File
+				RelativePath="..\..\include\wx\ctrlsub.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\cursor.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\custombgwin.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\dataobj.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\dataview.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\datectrl.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\dateevt.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\datetimectrl.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\dc.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\dcbuffer.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\dcclient.h">
 			</File>
 			<File
@@ -5673,21 +5691,24 @@
 				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
-				RelativePath="..\..\include\wx\scopeguard.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>
+			<File
+				RelativePath="..\..\include\wx\scopeguard.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\scrolbar.h">
 			</File>
 			<File
@@ -5699,6 +5720,9 @@
 			<File
 				RelativePath="..\..\include\wx\settings.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\simplebook.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\sizer.h">
 			</File>
@@ -5744,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>
@@ -5766,21 +5793,21 @@
 				RelativePath="..\..\include\wx\textentry.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\textwrapper.h">
-			</File>
-			<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\textwrapper.h">
+			</File>
+			<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
@@ -5841,12 +5868,15 @@
 				RelativePath="..\..\include\wx\vscroll.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\webview.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\webviewarchivehandler.h">
-			</File>
-			<File
+				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
@@ -5876,6 +5906,9 @@
 			<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>
@@ -5996,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>
@@ -6033,21 +6072,21 @@
 				RelativePath="..\..\include\wx\xrc\xh_sttxt.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_text.h">
-			</File>
-			<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_text.h">
+			</File>
+			<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>
 			<File
@@ -6062,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>
@@ -6069,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>