inside <wx-data> we need to use instead of /

[wxWidgets.git] / build / msw / wx_vc7_core.vcproj

diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj
index a6b599a3a3b29f898f2a16dbba94806f41900801..36e26c891178359e21e81136f6f9e409894511f8 100644 (file)
--- a/build/msw/wx_vc7_core.vcproj
+++ b/build/msw/wx_vc7_core.vcproj
@@ -835,6 +835,8 @@
                                RelativePath="..\..\src\common\wincmn.cpp"/>\r
                        <File\r
                                RelativePath="..\..\src\common\windowid.cpp"/>\r
                                RelativePath="..\..\src\common\wincmn.cpp"/>\r
                        <File\r
                                RelativePath="..\..\src\common\windowid.cpp"/>\r

+                       <File\r
+                               RelativePath="..\..\src\common\wrapsizer.cpp"/>\r

                        <File\r
                                RelativePath="..\..\src\common\xpmdecod.cpp"/>\r
                </Filter>\r
                        <File\r
                                RelativePath="..\..\src\common\xpmdecod.cpp"/>\r
                </Filter>\r


@@ -1162,7 +1164,7 @@
                                        ExcludedFromBuild="true"/>\r
                        </File>\r
                        <File\r
                                        ExcludedFromBuild="true"/>\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\msw\gauge95.cpp">\r
+                               RelativePath="..\..\src\msw\gauge.cpp">\r

                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"/>\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"/>\r


@@ -1333,6 +1335,21 @@
                                        Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"/>\r
                        </File>\r
                                        Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"/>\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\src\msw\nativewin.cpp">\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"/>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"/>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"/>\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\msw\notebook.cpp">\r
                                <FileConfiguration\r
                        <File\r
                                RelativePath="..\..\src\msw\notebook.cpp">\r
                                <FileConfiguration\r


@@ -1427,7 +1444,7 @@
                        <File\r
                                RelativePath="..\..\src\msw\settings.cpp"/>\r
                        <File\r
                        <File\r
                                RelativePath="..\..\src\msw\settings.cpp"/>\r
                        <File\r

-                               RelativePath="..\..\src\msw\slider95.cpp">\r
+                               RelativePath="..\..\src\msw\slider.cpp">\r

                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"/>\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"/>\r


@@ -1502,7 +1519,7 @@
                                        ExcludedFromBuild="true"/>\r
                        </File>\r
                        <File\r
                                        ExcludedFromBuild="true"/>\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\msw\statbr95.cpp">\r
+                               RelativePath="..\..\src\msw\statline.cpp">\r

                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"/>\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"/>\r


@@ -1517,7 +1534,7 @@
                                        ExcludedFromBuild="true"/>\r
                        </File>\r
                        <File\r
                                        ExcludedFromBuild="true"/>\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\msw\statline.cpp">\r
+                               RelativePath="..\..\src\msw\stattext.cpp">\r

                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"/>\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"/>\r


@@ -1532,7 +1549,7 @@
                                        ExcludedFromBuild="true"/>\r
                        </File>\r
                        <File\r
                                        ExcludedFromBuild="true"/>\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\msw\stattext.cpp">\r
+                               RelativePath="..\..\src\msw\statusbar.cpp">\r

                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"/>\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"/>\r


@@ -1562,7 +1579,7 @@
                                        ExcludedFromBuild="true"/>\r
                        </File>\r
                        <File\r
                                        ExcludedFromBuild="true"/>\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\msw\tbar95.cpp">\r
+                               RelativePath="..\..\src\msw\textctrl.cpp">\r

                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"/>\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"/>\r


@@ -1577,7 +1594,7 @@
                                        ExcludedFromBuild="true"/>\r
                        </File>\r
                        <File\r
                                        ExcludedFromBuild="true"/>\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\msw\textctrl.cpp">\r
+                               RelativePath="..\..\src\msw\textentry.cpp">\r

                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"/>\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"/>\r


@@ -1592,7 +1609,7 @@
                                        ExcludedFromBuild="true"/>\r
                        </File>\r
                        <File\r
                                        ExcludedFromBuild="true"/>\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\msw\textentry.cpp">\r
+                               RelativePath="..\..\src\msw\tglbtn.cpp">\r

                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"/>\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"/>\r


@@ -1607,7 +1624,7 @@
                                        ExcludedFromBuild="true"/>\r
                        </File>\r
                        <File\r
                                        ExcludedFromBuild="true"/>\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\msw\tglbtn.cpp">\r
+                               RelativePath="..\..\src\msw\toolbar.cpp">\r

                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"/>\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"/>\r


@@ -1856,6 +1873,8 @@
                                RelativePath="..\..\src\generic\splitter.cpp"/>\r
                        <File\r
                                RelativePath="..\..\src\generic\srchctlg.cpp"/>\r
                                RelativePath="..\..\src\generic\splitter.cpp"/>\r
                        <File\r
                                RelativePath="..\..\src\generic\srchctlg.cpp"/>\r

+                       <File\r
+                               RelativePath="..\..\src\generic\statbmpg.cpp"/>\r

                        <File\r
                                RelativePath="..\..\src\generic\statusbr.cpp">\r
                                <FileConfiguration\r
                        <File\r
                                RelativePath="..\..\src\generic\statusbr.cpp">\r
                                <FileConfiguration\r


@@ -1979,21 +1998,6 @@
                                        Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"/>\r
                        </File>\r
                                        Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"/>\r
                        </File>\r

-                       <File\r
-                               RelativePath="..\..\src\univ\colschem.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"/>\r
-                       </File>\r

                        <File\r
                                RelativePath="..\..\src\univ\combobox.cpp">\r
                                <FileConfiguration\r
                        <File\r
                                RelativePath="..\..\src\univ\combobox.cpp">\r
                                <FileConfiguration\r


@@ -2279,6 +2283,21 @@
                                        Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"/>\r
                        </File>\r
                                        Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"/>\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\src\univ\settingsuniv.cpp">\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       ExcludedFromBuild="true"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       ExcludedFromBuild="true"/>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       ExcludedFromBuild="true"/>\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="true"/>\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\univ\slider.cpp">\r
                                <FileConfiguration\r
                        <File\r
                                RelativePath="..\..\src\univ\slider.cpp">\r
                                <FileConfiguration\r


@@ -2521,7 +2540,7 @@
                                                Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h"\r
                                                CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswu\wx\setup.h"\r
                                                Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"\r
                                                Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h"\r
                                                CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswu\wx\setup.h"\r
                                                Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"\r

-                                               AdditionalDependencies="$(SOURCE) &quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
+                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r

                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="DLL Debug|Win32">\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="DLL Debug|Win32">\r


@@ -2530,7 +2549,7 @@
                                                Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h"\r
                                                CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswud\wx\setup.h"\r
                                                Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"\r
                                                Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h"\r
                                                CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswud\wx\setup.h"\r
                                                Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"\r

-                                               AdditionalDependencies="$(SOURCE) &quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
+                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r

                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="Universal Release|Win32"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="Universal Release|Win32"/>\r


@@ -2543,7 +2562,7 @@
                                                Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"\r
                                                CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswu\wx\setup.h"\r
                                                Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"\r
                                                Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"\r
                                                CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswu\wx\setup.h"\r
                                                Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"\r

-                                               AdditionalDependencies="$(SOURCE) &quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
+                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r

                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="Debug|Win32">\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="Debug|Win32">\r


@@ -2552,7 +2571,7 @@
                                                Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"\r
                                                CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswud\wx\setup.h"\r
                                                Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"\r
                                                Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"\r
                                                CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswud\wx\setup.h"\r
                                                Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"\r

-                                               AdditionalDependencies="$(SOURCE) &quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
+                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r

                                </FileConfiguration>\r
                        </File>\r
                        <File\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r


@@ -2564,7 +2583,7 @@
                                                Description="Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
                                                CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
                                                Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
                                                Description="Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
                                                CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
                                                Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"\r

-                                               AdditionalDependencies="$(SOURCE) &quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
+                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r

                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="DLL Universal Debug|Win32">\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="DLL Universal Debug|Win32">\r


@@ -2573,7 +2592,7 @@
                                                Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
                                                CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
                                                Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
                                                Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
                                                CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
                                                Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"\r

-                                               AdditionalDependencies="$(SOURCE) &quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
+                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r

                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"/>\r


@@ -2586,7 +2605,7 @@
                                                Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
                                                CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
                                                Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
                                                Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
                                                CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
                                                Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"\r

-                                               AdditionalDependencies="$(SOURCE) &quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
+                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r

                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="Universal Debug|Win32">\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="Universal Debug|Win32">\r


@@ -2595,7 +2614,7 @@
                                                Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
                                                CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
                                                Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
                                                Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
                                                CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
                                                Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"\r

-                                               AdditionalDependencies="$(SOURCE) &quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
+                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r

                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="Release|Win32"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="Release|Win32"/>\r


@@ -2620,10 +2639,14 @@
                                RelativePath="..\..\include\wx\msw\bitmap.h"/>\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\bmpbuttn.h"/>\r
                                RelativePath="..\..\include\wx\msw\bitmap.h"/>\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\bmpbuttn.h"/>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\msw\bmpcbox.h"/>\r

                        <File\r
                                RelativePath="..\..\include\wx\msw\brush.h"/>\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\button.h"/>\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\brush.h"/>\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\button.h"/>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\msw\calctrl.h"/>\r

                        <File\r
                                RelativePath="..\..\include\wx\msw\caret.h"/>\r
                        <File\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\caret.h"/>\r
                        <File\r


@@ -2654,6 +2677,8 @@
                                RelativePath="..\..\include\wx\msw\ole\dataobj.h"/>\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\ole\dataobj2.h"/>\r
                                RelativePath="..\..\include\wx\msw\ole\dataobj.h"/>\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\ole\dataobj2.h"/>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\msw\datecontrols.h"/>\r

                        <File\r
                                RelativePath="..\..\include\wx\msw\datectrl.h"/>\r
                        <File\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\datectrl.h"/>\r
                        <File\r


@@ -2693,7 +2718,7 @@
                        <File\r
                                RelativePath="..\..\include\wx\msw\frame.h"/>\r
                        <File\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\frame.h"/>\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\gauge95.h"/>\r
+                               RelativePath="..\..\include\wx\msw\gauge.h"/>\r

                        <File\r
                                RelativePath="..\..\include\wx\msw\gdiimage.h"/>\r
                        <File\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\gdiimage.h"/>\r
                        <File\r


@@ -2705,7 +2730,7 @@
                                                Description="Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"\r
                                                CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h&quot;"\r
                                                Outputs="..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"\r
                                                Description="Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"\r
                                                CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h&quot;"\r
                                                Outputs="..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"\r

-                                               AdditionalDependencies="&quot;$(SOURCE)&quot; &quot;..\..\lib\vc_dll\mswunivu\wx\msw&quot;"/>\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivu\wx\msw&quot;"/>\r

                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="DLL Universal Debug|Win32">\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="DLL Universal Debug|Win32">\r


@@ -2714,7 +2739,7 @@
                                                Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
                                                CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h&quot;"\r
                                                Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
                                                Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
                                                CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h&quot;"\r
                                                Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r

-                                               AdditionalDependencies="&quot;$(SOURCE)&quot; &quot;..\..\lib\vc_dll\mswunivud\wx\msw&quot;"/>\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivud\wx\msw&quot;"/>\r

                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32">\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32">\r


@@ -2723,7 +2748,7 @@
                                                Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
                                                CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h&quot;"\r
                                                Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
                                                Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
                                                CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h&quot;"\r
                                                Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r

-                                               AdditionalDependencies="&quot;$(SOURCE)&quot; &quot;..\..\lib\vc_dll\mswu\wx\msw&quot;"/>\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswu\wx\msw&quot;"/>\r

                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="DLL Debug|Win32">\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="DLL Debug|Win32">\r


@@ -2732,7 +2757,7 @@
                                                Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
                                                CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h&quot;"\r
                                                Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
                                                Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
                                                CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h&quot;"\r
                                                Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r

-                                               AdditionalDependencies="&quot;$(SOURCE)&quot; &quot;..\..\lib\vc_dll\mswud\wx\msw&quot;"/>\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswud\wx\msw&quot;"/>\r

                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="Universal Release|Win32">\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="Universal Release|Win32">\r


@@ -2741,7 +2766,7 @@
                                                Description="Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"\r
                                                CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h&quot;"\r
                                                Outputs="..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"\r
                                                Description="Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"\r
                                                CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h&quot;"\r
                                                Outputs="..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"\r

-                                               AdditionalDependencies="&quot;$(SOURCE)&quot; &quot;..\..\lib\vc_lib\mswunivu\wx\msw&quot;"/>\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivu\wx\msw&quot;"/>\r

                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="Universal Debug|Win32">\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="Universal Debug|Win32">\r


@@ -2750,7 +2775,7 @@
                                                Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
                                                CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h&quot;"\r
                                                Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
                                                Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
                                                CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h&quot;"\r
                                                Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r

-                                               AdditionalDependencies="&quot;$(SOURCE)&quot; &quot;..\..\lib\vc_lib\mswunivud\wx\msw&quot;"/>\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivud\wx\msw&quot;"/>\r

                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="Release|Win32">\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="Release|Win32">\r


@@ -2759,7 +2784,7 @@
                                                Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
                                                CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h&quot;"\r
                                                Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
                                                Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
                                                CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h&quot;"\r
                                                Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r

-                                               AdditionalDependencies="&quot;$(SOURCE)&quot; &quot;..\..\lib\vc_lib\mswu\wx\msw&quot;"/>\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswu\wx\msw&quot;"/>\r

                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="Debug|Win32">\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="Debug|Win32">\r


@@ -2768,7 +2793,7 @@
                                                Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
                                                CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;"\r
                                                Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
                                                Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
                                                CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;"\r
                                                Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r

-                                               AdditionalDependencies="&quot;$(SOURCE)&quot; &quot;..\..\lib\vc_lib\mswud\wx\msw&quot;"/>\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswud\wx\msw&quot;"/>\r

                                </FileConfiguration>\r
                        </File>\r
                        <File\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r


@@ -2838,7 +2863,7 @@
                        <File\r
                                RelativePath="..\..\include\wx\msw\setup0.h"/>\r
                        <File\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\setup0.h"/>\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\slider95.h"/>\r
+                               RelativePath="..\..\include\wx\msw\slider.h"/>\r

                        <File\r
                                RelativePath="..\..\include\wx\msw\sound.h"/>\r
                        <File\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\sound.h"/>\r
                        <File\r


@@ -2849,24 +2874,24 @@
                                RelativePath="..\..\include\wx\msw\statbmp.h"/>\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\statbox.h"/>\r
                                RelativePath="..\..\include\wx\msw\statbmp.h"/>\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\statbox.h"/>\r

-                       <File\r
-                               RelativePath="..\..\include\wx\msw\statbr95.h"/>\r

                        <File\r
                                RelativePath="..\..\include\wx\msw\statline.h"/>\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\stattext.h"/>\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\statline.h"/>\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\stattext.h"/>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\msw\statusbar.h"/>\r

                        <File\r
                                RelativePath="..\..\include\wx\msw\tabctrl.h"/>\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\taskbar.h"/>\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\tabctrl.h"/>\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\taskbar.h"/>\r

-                       <File\r
-                               RelativePath="..\..\include\wx\msw\tbar95.h"/>\r

                        <File\r
                                RelativePath="..\..\include\wx\msw\textctrl.h"/>\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\textentry.h"/>\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\tglbtn.h"/>\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\textctrl.h"/>\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\textentry.h"/>\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\tglbtn.h"/>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\msw\toolbar.h"/>\r

                        <File\r
                                RelativePath="..\..\include\wx\msw\tooltip.h"/>\r
                        <File\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\tooltip.h"/>\r
                        <File\r


@@ -2898,7 +2923,7 @@
                        <File\r
                                RelativePath="..\..\include\wx\generic\buttonbar.h"/>\r
                        <File\r
                        <File\r
                                RelativePath="..\..\include\wx\generic\buttonbar.h"/>\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\calctrl.h"/>\r
+                               RelativePath="..\..\include\wx\generic\calctrlg.h"/>\r

                        <File\r
                                RelativePath="..\..\include\wx\generic\choicdgg.h"/>\r
                        <File\r
                        <File\r
                                RelativePath="..\..\include\wx\generic\choicdgg.h"/>\r
                        <File\r


@@ -2983,6 +3008,8 @@
                                RelativePath="..\..\include\wx\generic\splitter.h"/>\r
                        <File\r
                                RelativePath="..\..\include\wx\generic\srchctlg.h"/>\r
                                RelativePath="..\..\include\wx\generic\splitter.h"/>\r
                        <File\r
                                RelativePath="..\..\include\wx\generic\srchctlg.h"/>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\generic\statbmpg.h"/>\r

                        <File\r
                                RelativePath="..\..\include\wx\generic\statusbr.h"/>\r
                        <File\r
                        <File\r
                                RelativePath="..\..\include\wx\generic\statusbr.h"/>\r
                        <File\r


@@ -3121,6 +3148,8 @@
                                RelativePath="..\..\include\wx\accel.h"/>\r
                        <File\r
                                RelativePath="..\..\include\wx\access.h"/>\r
                                RelativePath="..\..\include\wx\accel.h"/>\r
                        <File\r
                                RelativePath="..\..\include\wx\access.h"/>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\propgrid\advprops.h"/>\r

                        <File\r
                                RelativePath="..\..\include\wx\anidecod.h"/>\r
                        <File\r
                        <File\r
                                RelativePath="..\..\include\wx\anidecod.h"/>\r
                        <File\r


@@ -3131,6 +3160,8 @@
                                RelativePath="..\..\include\wx\artprov.h"/>\r
                        <File\r
                                RelativePath="..\..\include\wx\aui\aui.h"/>\r
                                RelativePath="..\..\include\wx\artprov.h"/>\r
                        <File\r
                                RelativePath="..\..\include\wx\aui\aui.h"/>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\aui\auibar.h"/>\r

                        <File\r
                                RelativePath="..\..\include\wx\aui\auibook.h"/>\r
                        <File\r
                        <File\r
                                RelativePath="..\..\include\wx\aui\auibook.h"/>\r
                        <File\r


@@ -3243,6 +3274,8 @@
                                RelativePath="..\..\include\wx\dragimag.h"/>\r
                        <File\r
                                RelativePath="..\..\include\wx\editlbox.h"/>\r
                                RelativePath="..\..\include\wx\dragimag.h"/>\r
                        <File\r
                                RelativePath="..\..\include\wx\editlbox.h"/>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\propgrid\editors.h"/>\r

                        <File\r
                                RelativePath="..\..\include\wx\effects.h"/>\r
                        <File\r
                        <File\r
                                RelativePath="..\..\include\wx\effects.h"/>\r
                        <File\r


@@ -3347,6 +3380,8 @@
                                RelativePath="..\..\include\wx\listbox.h"/>\r
                        <File\r
                                RelativePath="..\..\include\wx\listctrl.h"/>\r
                                RelativePath="..\..\include\wx\listbox.h"/>\r
                        <File\r
                                RelativePath="..\..\include\wx\listctrl.h"/>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\propgrid\manager.h"/>\r

                        <File\r
                                RelativePath="..\..\include\wx\matrix.h"/>\r
                        <File\r
                        <File\r
                                RelativePath="..\..\include\wx\matrix.h"/>\r
                        <File\r


@@ -3363,6 +3398,8 @@
                                RelativePath="..\..\include\wx\minifram.h"/>\r
                        <File\r
                                RelativePath="..\..\include\wx\msgdlg.h"/>\r
                                RelativePath="..\..\include\wx\minifram.h"/>\r
                        <File\r
                                RelativePath="..\..\include\wx\msgdlg.h"/>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\nativewin.h"/>\r

                        <File\r
                                RelativePath="..\..\include\wx\nonownedwnd.h"/>\r
                        <File\r
                        <File\r
                                RelativePath="..\..\include\wx\nonownedwnd.h"/>\r
                        <File\r


@@ -3401,6 +3438,18 @@
                                RelativePath="..\..\include\wx\progdlg.h"/>\r
                        <File\r
                                RelativePath="..\..\include\wx\propdlg.h"/>\r
                                RelativePath="..\..\include\wx\progdlg.h"/>\r
                        <File\r
                                RelativePath="..\..\include\wx\propdlg.h"/>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\propgrid\property.h"/>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\propgrid\propgrid.h"/>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\propgrid\propgriddefs.h"/>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\propgrid\propgridiface.h"/>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\propgrid\propgridpagestate.h"/>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\propgrid\props.h"/>\r

                        <File\r
                                RelativePath="..\..\include\wx\quantize.h"/>\r
                        <File\r
                        <File\r
                                RelativePath="..\..\include\wx\quantize.h"/>\r
                        <File\r


@@ -3493,6 +3542,8 @@
                                RelativePath="..\..\include\wx\tipdlg.h"/>\r
                        <File\r
                                RelativePath="..\..\include\wx\tipwin.h"/>\r
                                RelativePath="..\..\include\wx\tipdlg.h"/>\r
                        <File\r
                                RelativePath="..\..\include\wx\tipwin.h"/>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\tls.h"/>\r

                        <File\r
                                RelativePath="..\..\include\wx\toolbar.h"/>\r
                        <File\r
                        <File\r
                                RelativePath="..\..\include\wx\toolbar.h"/>\r
                        <File\r


@@ -3527,6 +3578,8 @@
                                RelativePath="..\..\include\wx\windowid.h"/>\r
                        <File\r
                                RelativePath="..\..\include\wx\wizard.h"/>\r
                                RelativePath="..\..\include\wx\windowid.h"/>\r
                        <File\r
                                RelativePath="..\..\include\wx\wizard.h"/>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\wrapsizer.h"/>\r

                        <File\r
                                RelativePath="..\..\include\wx\wupdlock.h"/>\r
                        <File\r
                        <File\r
                                RelativePath="..\..\include\wx\wupdlock.h"/>\r
                        <File\r