makefile regen, include fix, duplicate file fix

[wxWidgets.git] / src / wxWindows.dsp

diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp
index 8a3d521ede746586ce28bec7d6090b977fa63c52..ea5c20a9ac644aac662c43c6dc70aeb3b3dc9584 100644 (file)
--- a/src/wxWindows.dsp
+++ b/src/wxWindows.dsp
@@ -288,6 +288,10 @@ LIB32=link.exe -lib
 # Name "wxWindows - Win32 Release"
 # Name "wxWindows - Win32 Debug"
 # Name "wxWindows - Win32 Release With Debug Info"
+# Begin Source File
+
+SOURCE="This project is deprecated, please see install.txt"
+# End Source File
 # Begin Group "Common Files"
 
 # PROP Default_Filter ""
@@ -305,6 +309,10 @@ SOURCE=.\common\appcmn.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\archive.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\artprov.cpp
 # End Source File
 # Begin Source File
@@ -522,6 +530,10 @@ SOURCE=.\common\gaugecmn.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\gbsizer.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\gdicmn.cpp
 # End Source File
 # Begin Source File
@@ -638,6 +650,10 @@ SOURCE=.\common\matrix.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\mediactrlcmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\memory.cpp
 # End Source File
 # Begin Source File
@@ -738,10 +754,22 @@ SOURCE=.\common\socket.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\sstream.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\statbar.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\stdpbase.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\common\stockitem.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\stopwatch.cpp
 # End Source File
 # Begin Source File
@@ -802,8 +830,7 @@ SOURCE=.\common\txtstrm.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\unzip.c
-# SUBTRACT CPP /YX /Yc /Yu
+SOURCE=.\common\uri.cpp
 # End Source File
 # Begin Source File
 
@@ -879,11 +906,11 @@ SOURCE=.\generic\calctrl.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\generic\choicdgg.cpp
+SOURCE=.\generic\choicbkg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\generic\dcbuffer.cpp
+SOURCE=.\generic\choicdgg.cpp
 # End Source File
 # Begin Source File
 
@@ -943,6 +970,10 @@ SOURCE=.\generic\printps.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\generic\prntdlgg.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\generic\progdlgg.cpp
 # End Source File
 # Begin Source File
@@ -1280,13 +1311,11 @@ SOURCE=.\msw\glcanvas.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\gsocket.c
-# SUBTRACT CPP /YX /Yc /Yu
+SOURCE=.\msw\gsocket.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\gsockmsw.c
-# SUBTRACT CPP /YX /Yc /Yu
+SOURCE=.\msw\gsockmsw.cpp
 # End Source File
 # Begin Source File
 
@@ -1334,6 +1363,10 @@ SOURCE=.\msw\mdi.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\mediactrl.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\menu.cpp
 # End Source File
 # Begin Source File
@@ -1462,6 +1495,10 @@ SOURCE=.\msw\snglinst.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\sound.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\spinbutt.cpp
 # End Source File
 # Begin Source File
@@ -1490,6 +1527,10 @@ SOURCE=.\msw\stattext.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\stdpaths.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\tabctrl.cpp
 # End Source File
 # Begin Source File
@@ -1530,6 +1571,10 @@ SOURCE=.\msw\treectrl.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\urlmsw.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\utils.cpp
 # End Source File
 # Begin Source File
@@ -1550,10 +1595,6 @@ SOURCE=.\msw\volume.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\wave.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\msw\window.cpp
 # End Source File
 # End Group
@@ -1564,6 +1605,162 @@ SOURCE=.\msw\window.cpp
 
 SOURCE=.\xml\xml.cpp
 # End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_bmp.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_bmpbt.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_bttn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_cald.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_chckb.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_chckl.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_choic.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_combo.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_dlg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_frame.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_gauge.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_gdctl.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_html.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_listb.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_listc.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_menu.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_notbk.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_panel.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_radbt.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_radbx.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_scrol.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_scwin.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_sizer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_slidr.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_spin.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_split.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_statbar.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_stbmp.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_stbox.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_stlin.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_sttxt.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_text.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_tglbtn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_toolb.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_tree.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_unkwn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_wizrd.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xmlres.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xmlrsall.cpp
+# End Source File
 # End Group
 # Begin Group "Headers"
 
@@ -1766,6 +1963,10 @@ SOURCE=..\include\wx\choice.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\choicebk.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\clipbrd.h
 # End Source File
 # Begin Source File
@@ -1922,6 +2123,10 @@ SOURCE=..\include\wx\display.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\dlimpexp.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\dnd.h
 # End Source File
 # Begin Source File
@@ -1958,6 +2163,10 @@ SOURCE=..\include\wx\encconv.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\encinfo.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\event.h
 # End Source File
 # Begin Source File
@@ -1966,6 +2175,10 @@ SOURCE=..\include\wx\evtloop.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\except.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\fdrepdlg.h
 # End Source File
 # Begin Source File
@@ -2050,6 +2263,10 @@ SOURCE=..\include\wx\gauge.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\gbsizer.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\gdicmn.h
 # End Source File
 # Begin Source File
@@ -2250,6 +2467,10 @@ SOURCE=..\include\wx\mdi.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\mediactrl.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\memconf.h
 # End Source File
 # Begin Source File
@@ -2306,6 +2527,10 @@ SOURCE=..\include\wx\notebook.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\numdlg.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\object.h
 # End Source File
 # Begin Source File
@@ -2470,6 +2695,10 @@ SOURCE=..\include\wx\socket.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\sound.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\spinbutt.h
 # End Source File
 # Begin Source File
@@ -2486,6 +2715,10 @@ SOURCE=..\include\wx\splitter.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\sstream.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\stack.h
 # End Source File
 # Begin Source File
@@ -2510,6 +2743,14 @@ SOURCE=..\include\wx\statusbr.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\stdpaths.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\stockitem.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\stopwatch.h
 # End Source File
 # Begin Source File
@@ -2614,6 +2855,10 @@ SOURCE=..\include\wx\types.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\uri.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\url.h
 # End Source File
 # Begin Source File
@@ -2646,6 +2891,10 @@ SOURCE=..\include\wx\version.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\vidmode.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\vlbox.h
 # End Source File
 # Begin Source File
@@ -2706,6 +2955,162 @@ SOURCE=..\include\wx\xpmhand.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\xrc\xh_all.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_bmp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_bmpbt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_bttn.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_cald.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_chckb.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_chckl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_choic.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_combo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_dlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_frame.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_gauge.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_gdctl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_html.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_listb.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_listc.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_menu.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_notbk.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_panel.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_radbt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_radbx.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_scrol.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_scwin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_sizer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_slidr.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_spin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_split.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_statbar.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_stbmp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_stbox.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_stlin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_sttxt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_text.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_tglbtn.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_toolb.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_tree.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_unkwn.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_wizrd.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xmlres.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\xti.h
 # End Source File
 # Begin Source File
@@ -2854,6 +3259,10 @@ SOURCE=..\include\wx\msw\enhmeta.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\msw\evtloop.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\msw\fdrepdlg.h
 # End Source File
 # Begin Source File
@@ -2906,14 +3315,6 @@ SOURCE=..\include\wx\msw\helpbest.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\helpchm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\msw\helpwin.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\msw\icon.h
 # End Source File
 # Begin Source File
@@ -3074,6 +3475,10 @@ SOURCE=..\include\wx\msw\slidrmsw.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\msw\sound.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\msw\spinbutt.h
 # End Source File
 # Begin Source File
@@ -3142,10 +3547,6 @@ SOURCE=..\include\wx\msw\treectrl.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\wave.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\msw\window.h
 # End Source File
 # Begin Source File
@@ -3238,6 +3639,10 @@ SOURCE=..\include\wx\generic\notebook.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\generic\numdlgg.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\generic\panelg.h
 # End Source File
 # Begin Source File