X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/506e9b7ed2bee097fd3674061f6962e54bdea7bf..197380a09fb9b151f227edee850e251f28053309:/build/msw/wx_vc7_core.vcproj

diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj
index 3b9c2e76ae..96b25ddd11 100644
--- a/build/msw/wx_vc7_core.vcproj
+++ b/build/msw/wx_vc7_core.vcproj
@@ -47,7 +47,7 @@
 			<Tool
 				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 ..\..\lib\vc_dll\wxbase29u.lib"
+				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"
 				ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_core.lib"
@@ -114,7 +114,7 @@
 			<Tool
 				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 ..\..\lib\vc_dll\wxbase29ud.lib"
+				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"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_core.lib"
@@ -178,7 +178,7 @@
 			<Tool
 				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 ..\..\lib\vc_dll\wxbase29u.lib"
+				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"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw29u_core.lib"
@@ -245,7 +245,7 @@
 			<Tool
 				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 ..\..\lib\vc_dll\wxbase29ud.lib"
+				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"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_core.lib"
@@ -723,6 +723,12 @@
 			<File
 				RelativePath="..\..\src\common\graphcmn.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\common\headercolcmn.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\common\headerctrlcmn.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\helpbase.cpp">
 			</File>
@@ -795,6 +801,9 @@
 			<File
 				RelativePath="..\..\src\common\paper.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\common\persist.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\pickerbase.cpp">
 			</File>
@@ -810,6 +819,9 @@
 			<File
 				RelativePath="..\..\src\common\radiocmn.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\common\rearrangectrl.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\rendcmn.cpp">
 			</File>
@@ -822,6 +834,9 @@
 			<File
 				RelativePath="..\..\src\common\sizer.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\common\spinctrlcmn.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\srchcmn.cpp">
 			</File>
@@ -907,6 +922,21 @@
 					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
+			<File
+				RelativePath="..\..\src\msw\ole\activex.cpp">
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\app.cpp">
 			</File>
@@ -1264,6 +1294,21 @@
 			<File
 				RelativePath="..\..\src\msw\graphics.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\msw\headerctrl.cpp">
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\helpchm.cpp">
 			</File>
@@ -1657,21 +1702,6 @@
 					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
-			<File
-				RelativePath="..\..\src\msw\tabctrl.cpp">
-				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
-				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
-				<FileConfiguration
-					Name="Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
-				<FileConfiguration
-					Name="Universal Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
-			</File>
 			<File
 				RelativePath="..\..\src\msw\textctrl.cpp">
 				<FileConfiguration
@@ -1916,6 +1946,9 @@
 			<File
 				RelativePath="..\..\src\generic\fontpickerg.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\generic\headerctrlg.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\generic\listbkg.cpp">
 			</File>
@@ -2021,21 +2054,6 @@
 					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
-			<File
-				RelativePath="..\..\src\generic\tabg.cpp">
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="TRUE"/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="TRUE"/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
-			</File>
 			<File
 				RelativePath="..\..\src\generic\textdlgg.cpp">
 			</File>
@@ -2841,9 +2859,6 @@
 			<File
 				RelativePath="..\..\include\wx\msw\ole\dataobj2.h">
 			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\datecontrols.h">
-			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\datectrl.h">
 			</File>
@@ -2985,6 +3000,9 @@
 			<File
 				RelativePath="..\..\include\wx\msw\glcanvas.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\headerctrl.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\helpbest.h">
 			</File>
@@ -3108,9 +3126,6 @@
 			<File
 				RelativePath="..\..\include\wx\msw\statusbar.h">
 			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\tabctrl.h">
-			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\taskbar.h">
 			</File>
@@ -3232,9 +3247,15 @@
 			<File
 				RelativePath="..\..\include\wx\generic\gridctrl.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\grideditors.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\gridsel.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\headerctrlg.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\helpext.h">
 			</File>
@@ -3307,9 +3328,6 @@
 			<File
 				RelativePath="..\..\include\wx\generic\statusbr.h">
 			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\tabg.h">
-			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\textdlgg.h">
 			</File>
@@ -3538,6 +3556,9 @@
 			<File
 				RelativePath="..\..\include\wx\bmpcbox.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\persist\bookctrl.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\bookctrl.h">
 			</File>
@@ -3772,6 +3793,12 @@
 			<File
 				RelativePath="..\..\include\wx\grid.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\headercol.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\headerctrl.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\help.h">
 			</File>
@@ -3916,6 +3943,9 @@
 			<File
 				RelativePath="..\..\include\wx\pen.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\persist.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\pickerbase.h">
 			</File>
@@ -3970,6 +4000,9 @@
 			<File
 				RelativePath="..\..\include\wx\rawbmp.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\rearrangectrl.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\region.h">
 			</File>
@@ -4063,12 +4096,6 @@
 			<File
 				RelativePath="..\..\include\wx\stc\stc.h">
 			</File>
-			<File
-				RelativePath="..\..\include\wx\tab.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\tabctrl.h">
-			</File>
 			<File
 				RelativePath="..\..\include\wx\aui\tabmdi.h">
 			</File>
@@ -4096,9 +4123,6 @@
 			<File
 				RelativePath="..\..\include\wx\tipwin.h">
 			</File>
-			<File
-				RelativePath="..\..\include\wx\tls.h">
-			</File>
 			<File
 				RelativePath="..\..\include\wx\toolbar.h">
 			</File>
@@ -4111,12 +4135,18 @@
 			<File
 				RelativePath="..\..\include\wx\toplevel.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\persist\toplevel.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\treebase.h">
 			</File>
 			<File
 				RelativePath="..\..\include\wx\treebook.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\persist\treebook.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\treectrl.h">
 			</File>
@@ -4144,6 +4174,9 @@
 			<File
 				RelativePath="..\..\include\wx\window.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\persist\window.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\windowid.h">
 			</File>
@@ -4201,6 +4234,9 @@
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_combo.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_comboctrl.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_datectrl.h">
 			</File>