X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6e0fbb3dbf4501b4113f2d5fe775850b7dabc477..c77dd0a4bd9465dc77527b938a7636fc7531eb33:/build/msw/wx_vc7_core.vcproj

diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj
index a6b599a3a3..2fdc16f778 100644
--- a/build/msw/wx_vc7_core.vcproj
+++ b/build/msw/wx_vc7_core.vcproj
@@ -1162,7 +1162,7 @@
 					ExcludedFromBuild="true"/>
 			</File>
 			<File
-				RelativePath="..\..\src\msw\gauge95.cpp">
+				RelativePath="..\..\src\msw\gauge.cpp">
 				<FileConfiguration
 					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"/>
@@ -1333,6 +1333,21 @@
 					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"/>
 			</File>
+			<File
+				RelativePath="..\..\src\msw\nativewin.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\notebook.cpp">
 				<FileConfiguration
@@ -1427,7 +1442,7 @@
 			<File
 				RelativePath="..\..\src\msw\settings.cpp"/>
 			<File
-				RelativePath="..\..\src\msw\slider95.cpp">
+				RelativePath="..\..\src\msw\slider.cpp">
 				<FileConfiguration
 					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"/>
@@ -1502,7 +1517,7 @@
 					ExcludedFromBuild="true"/>
 			</File>
 			<File
-				RelativePath="..\..\src\msw\statbr95.cpp">
+				RelativePath="..\..\src\msw\statline.cpp">
 				<FileConfiguration
 					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"/>
@@ -1517,7 +1532,7 @@
 					ExcludedFromBuild="true"/>
 			</File>
 			<File
-				RelativePath="..\..\src\msw\statline.cpp">
+				RelativePath="..\..\src\msw\stattext.cpp">
 				<FileConfiguration
 					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"/>
@@ -1532,7 +1547,7 @@
 					ExcludedFromBuild="true"/>
 			</File>
 			<File
-				RelativePath="..\..\src\msw\stattext.cpp">
+				RelativePath="..\..\src\msw\statusbar.cpp">
 				<FileConfiguration
 					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"/>
@@ -1562,7 +1577,7 @@
 					ExcludedFromBuild="true"/>
 			</File>
 			<File
-				RelativePath="..\..\src\msw\tbar95.cpp">
+				RelativePath="..\..\src\msw\textctrl.cpp">
 				<FileConfiguration
 					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"/>
@@ -1577,7 +1592,7 @@
 					ExcludedFromBuild="true"/>
 			</File>
 			<File
-				RelativePath="..\..\src\msw\textctrl.cpp">
+				RelativePath="..\..\src\msw\textentry.cpp">
 				<FileConfiguration
 					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"/>
@@ -1592,7 +1607,7 @@
 					ExcludedFromBuild="true"/>
 			</File>
 			<File
-				RelativePath="..\..\src\msw\textentry.cpp">
+				RelativePath="..\..\src\msw\tglbtn.cpp">
 				<FileConfiguration
 					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"/>
@@ -1607,7 +1622,7 @@
 					ExcludedFromBuild="true"/>
 			</File>
 			<File
-				RelativePath="..\..\src\msw\tglbtn.cpp">
+				RelativePath="..\..\src\msw\toolbar.cpp">
 				<FileConfiguration
 					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="true"/>
@@ -2521,7 +2536,7 @@
 						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="$(SOURCE) &quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
+						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="DLL Debug|Win32">
@@ -2530,7 +2545,7 @@
 						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="$(SOURCE) &quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
+						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Universal Release|Win32"/>
@@ -2543,7 +2558,7 @@
 						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="$(SOURCE) &quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
+						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
@@ -2552,7 +2567,7 @@
 						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="$(SOURCE) &quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
+						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -2564,7 +2579,7 @@
 						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="$(SOURCE) &quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
+						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="DLL Universal Debug|Win32">
@@ -2573,7 +2588,7 @@
 						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="$(SOURCE) &quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
+						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="DLL Release|Win32"/>
@@ -2586,7 +2601,7 @@
 						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="$(SOURCE) &quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
+						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Universal Debug|Win32">
@@ -2595,7 +2610,7 @@
 						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="$(SOURCE) &quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
+						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|Win32"/>
@@ -2624,6 +2639,8 @@
 				RelativePath="..\..\include\wx\msw\brush.h"/>
 			<File
 				RelativePath="..\..\include\wx\msw\button.h"/>
+			<File
+				RelativePath="..\..\include\wx\msw\calctrl.h"/>
 			<File
 				RelativePath="..\..\include\wx\msw\caret.h"/>
 			<File
@@ -2654,6 +2671,8 @@
 				RelativePath="..\..\include\wx\msw\ole\dataobj.h"/>
 			<File
 				RelativePath="..\..\include\wx\msw\ole\dataobj2.h"/>
+			<File
+				RelativePath="..\..\include\wx\msw\datecontrols.h"/>
 			<File
 				RelativePath="..\..\include\wx\msw\datectrl.h"/>
 			<File
@@ -2693,7 +2712,7 @@
 			<File
 				RelativePath="..\..\include\wx\msw\frame.h"/>
 			<File
-				RelativePath="..\..\include\wx\msw\gauge95.h"/>
+				RelativePath="..\..\include\wx\msw\gauge.h"/>
 			<File
 				RelativePath="..\..\include\wx\msw\gdiimage.h"/>
 			<File
@@ -2705,7 +2724,7 @@
 						Description="Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
 						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h&quot;"
 						Outputs="..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
-						AdditionalDependencies="&quot;$(SOURCE)&quot; &quot;..\..\lib\vc_dll\mswunivu\wx\msw&quot;"/>
+						AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivu\wx\msw&quot;"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="DLL Universal Debug|Win32">
@@ -2714,7 +2733,7 @@
 						Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
 						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h&quot;"
 						Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
-						AdditionalDependencies="&quot;$(SOURCE)&quot; &quot;..\..\lib\vc_dll\mswunivud\wx\msw&quot;"/>
+						AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivud\wx\msw&quot;"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="DLL Release|Win32">
@@ -2723,7 +2742,7 @@
 						Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
 						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h&quot;"
 						Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
-						AdditionalDependencies="&quot;$(SOURCE)&quot; &quot;..\..\lib\vc_dll\mswu\wx\msw&quot;"/>
+						AdditionalDependencies="&quot;..\..\lib\vc_dll\mswu\wx\msw&quot;"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="DLL Debug|Win32">
@@ -2732,7 +2751,7 @@
 						Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
 						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h&quot;"
 						Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
-						AdditionalDependencies="&quot;$(SOURCE)&quot; &quot;..\..\lib\vc_dll\mswud\wx\msw&quot;"/>
+						AdditionalDependencies="&quot;..\..\lib\vc_dll\mswud\wx\msw&quot;"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Universal Release|Win32">
@@ -2741,7 +2760,7 @@
 						Description="Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
 						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h&quot;"
 						Outputs="..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
-						AdditionalDependencies="&quot;$(SOURCE)&quot; &quot;..\..\lib\vc_lib\mswunivu\wx\msw&quot;"/>
+						AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivu\wx\msw&quot;"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Universal Debug|Win32">
@@ -2750,7 +2769,7 @@
 						Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
 						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h&quot;"
 						Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
-						AdditionalDependencies="&quot;$(SOURCE)&quot; &quot;..\..\lib\vc_lib\mswunivud\wx\msw&quot;"/>
+						AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivud\wx\msw&quot;"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|Win32">
@@ -2759,7 +2778,7 @@
 						Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
 						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h&quot;"
 						Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
-						AdditionalDependencies="&quot;$(SOURCE)&quot; &quot;..\..\lib\vc_lib\mswu\wx\msw&quot;"/>
+						AdditionalDependencies="&quot;..\..\lib\vc_lib\mswu\wx\msw&quot;"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
@@ -2768,7 +2787,7 @@
 						Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
 						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;"
 						Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
-						AdditionalDependencies="&quot;$(SOURCE)&quot; &quot;..\..\lib\vc_lib\mswud\wx\msw&quot;"/>
+						AdditionalDependencies="&quot;..\..\lib\vc_lib\mswud\wx\msw&quot;"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -2838,7 +2857,7 @@
 			<File
 				RelativePath="..\..\include\wx\msw\setup0.h"/>
 			<File
-				RelativePath="..\..\include\wx\msw\slider95.h"/>
+				RelativePath="..\..\include\wx\msw\slider.h"/>
 			<File
 				RelativePath="..\..\include\wx\msw\sound.h"/>
 			<File
@@ -2849,24 +2868,24 @@
 				RelativePath="..\..\include\wx\msw\statbmp.h"/>
 			<File
 				RelativePath="..\..\include\wx\msw\statbox.h"/>
-			<File
-				RelativePath="..\..\include\wx\msw\statbr95.h"/>
 			<File
 				RelativePath="..\..\include\wx\msw\statline.h"/>
 			<File
 				RelativePath="..\..\include\wx\msw\stattext.h"/>
+			<File
+				RelativePath="..\..\include\wx\msw\statusbar.h"/>
 			<File
 				RelativePath="..\..\include\wx\msw\tabctrl.h"/>
 			<File
 				RelativePath="..\..\include\wx\msw\taskbar.h"/>
-			<File
-				RelativePath="..\..\include\wx\msw\tbar95.h"/>
 			<File
 				RelativePath="..\..\include\wx\msw\textctrl.h"/>
 			<File
 				RelativePath="..\..\include\wx\msw\textentry.h"/>
 			<File
 				RelativePath="..\..\include\wx\msw\tglbtn.h"/>
+			<File
+				RelativePath="..\..\include\wx\msw\toolbar.h"/>
 			<File
 				RelativePath="..\..\include\wx\msw\tooltip.h"/>
 			<File
@@ -2898,7 +2917,7 @@
 			<File
 				RelativePath="..\..\include\wx\generic\buttonbar.h"/>
 			<File
-				RelativePath="..\..\include\wx\generic\calctrl.h"/>
+				RelativePath="..\..\include\wx\generic\calctrlg.h"/>
 			<File
 				RelativePath="..\..\include\wx\generic\choicdgg.h"/>
 			<File
@@ -3363,6 +3382,8 @@
 				RelativePath="..\..\include\wx\minifram.h"/>
 			<File
 				RelativePath="..\..\include\wx\msgdlg.h"/>
+			<File
+				RelativePath="..\..\include\wx\nativewin.h"/>
 			<File
 				RelativePath="..\..\include\wx\nonownedwnd.h"/>
 			<File