X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/05f4dfa7268b60d2f56a685933c49f3d3d4be745..4e621d24713f971d1a2d440f79ccc4593aede4b6:/build/msw/wx_vc7_core.vcproj

diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj
index 6bd12caa7c..6a2a2a04a7 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\wxmsw294ud_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\wxmsw294ud_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\wxmsw294ud_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=wxmsw294ud_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\wxmsw294u_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\wxmsw294u_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\wxmsw294u_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=wxmsw294u_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\wxmswuniv294ud_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\wxmswuniv294ud_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\wxmswuniv294ud_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=wxmswuniv294ud_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\wxmswuniv294u_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\wxmswuniv294u_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\wxmswuniv294u_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=wxmswuniv294u_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
@@ -1895,9 +1895,9 @@
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
-				RelativePath="..\..\src\msw\nonownedwnd.cpp">
-			</File>
-			<File
+				RelativePath="..\..\src\msw\nonownedwnd.cpp">
+			</File>
+			<File
 				RelativePath="..\..\src\msw\notebook.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
@@ -4319,9 +4319,9 @@
 				RelativePath="..\..\include\wx\msw\cursor.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\custombgwin.h">
-			</File>
-			<File
+				RelativePath="..\..\include\wx\msw\custombgwin.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\msw\ole\dataform.h">
 			</File>
 			<File
@@ -4334,9 +4334,9 @@
 				RelativePath="..\..\include\wx\msw\datectrl.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\datetimectrl.h">
-			</File>
-			<File
+				RelativePath="..\..\include\wx\msw\datetimectrl.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\msw\dc.h">
 			</File>
 			<File
@@ -4501,6 +4501,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>
@@ -4535,9 +4538,9 @@
 				RelativePath="..\..\include\wx\msw\msvcrt.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\nonownedwnd.h">
-			</File>
-			<File
+				RelativePath="..\..\include\wx\msw\nonownedwnd.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\msw\notebook.h">
 			</File>
 			<File
@@ -4588,9 +4591,6 @@
 			<File
 				RelativePath="..\..\include\wx\msw\scrolbar.h">
 			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\setup0.h">
-			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\slider.h">
 			</File>
@@ -4631,9 +4631,9 @@
 				RelativePath="..\..\include\wx\msw\tglbtn.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\timectrl.h">
-			</File>
-			<File
+				RelativePath="..\..\include\wx\msw\timectrl.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\msw\toolbar.h">
 			</File>
 			<File
@@ -4654,6 +4654,12 @@
 			<File
 				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\window.h">
 			</File>
@@ -4701,9 +4707,9 @@
 				RelativePath="..\..\include\wx\generic\ctrlsub.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\generic\custombgwin.h">
-			</File>
-			<File
+				RelativePath="..\..\include\wx\generic\custombgwin.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\generic\dataview.h">
 			</File>
 			<File
@@ -4842,9 +4848,9 @@
 				RelativePath="..\..\include\wx\generic\textdlgg.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\generic\timectrl.h">
-			</File>
-			<File
+				RelativePath="..\..\include\wx\generic\timectrl.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\generic\treectlg.h">
 			</File>
 			<File
@@ -4888,9 +4894,9 @@
 				RelativePath="..\..\include\wx\univ\control.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\univ\custombgwin.h">
-			</File>
-			<File
+				RelativePath="..\..\include\wx\univ\custombgwin.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\univ\dialog.h">
 			</File>
 			<File
@@ -5196,9 +5202,9 @@
 				RelativePath="..\..\include\wx\cursor.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\custombgwin.h">
-			</File>
-			<File
+				RelativePath="..\..\include\wx\custombgwin.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\dataobj.h">
 			</File>
 			<File
@@ -5211,9 +5217,9 @@
 				RelativePath="..\..\include\wx\dateevt.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\datetimectrl.h">
-			</File>
-			<File
+				RelativePath="..\..\include\wx\datetimectrl.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\dc.h">
 			</File>
 			<File
@@ -5673,9 +5679,9 @@
 				RelativePath="..\..\include\wx\richtext\richtextxml.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\richtooltip.h">
-			</File>
-			<File
+				RelativePath="..\..\include\wx\richtooltip.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\sashwin.h">
 			</File>
 			<File
@@ -5738,6 +5744,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,9 +5775,9 @@
 				RelativePath="..\..\include\wx\tglbtn.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\timectrl.h">
-			</File>
-			<File
+				RelativePath="..\..\include\wx\timectrl.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\tipdlg.h">
 			</File>
 			<File
@@ -5834,6 +5843,12 @@
 			<File
 				RelativePath="..\..\include\wx\vscroll.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\webview.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\webviewarchivehandler.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\persist\window.h">
 			</File>
@@ -6027,9 +6042,9 @@
 				RelativePath="..\..\include\wx\xrc\xh_tglbtn.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_timectrl.h">
-			</File>
-			<File
+				RelativePath="..\..\include\wx\xrc\xh_timectrl.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\xrc\xh_toolb.h">
 			</File>
 			<File