Windows compilation fixes after recent changes

[wxWidgets.git] / src / wxUniv.dsp

diff --git a/src/wxUniv.dsp b/src/wxUniv.dsp
index 4affb2d59989b1111bc70ec329d3bbb8902fc209..db54216826e7cb661960376e7f8fcf07ba050457 100644 (file)
--- a/src/wxUniv.dsp
+++ b/src/wxUniv.dsp
@@ -23,8 +23,8 @@ CFG=wxUniv - Win32 Debug
 
 # Begin Project
 # PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName "wxUniv"
-# PROP Scc_LocalPath ".."
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
 CPP=cl.exe
 RSC=rc.exe
 
@@ -49,7 +49,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\lib\wxuniv.lib"
+# ADD LIB32 /nologo
 
 !ELSEIF  "$(CFG)" == "wxUniv - Win32 Debug"
 
@@ -89,6 +89,18 @@ SOURCE=.\common\appcmn.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\artprov.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\common\artstd.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\common\bmpbase.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\choiccmn.cpp
 # End Source File
 # Begin Source File
@@ -181,6 +193,10 @@ SOURCE=.\common\docview.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\dseldlg.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\dynarray.cpp
 # End Source File
 # Begin Source File
@@ -189,6 +205,10 @@ SOURCE=.\common\dynlib.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\dynload.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\effects.cpp
 # End Source File
 # Begin Source File
@@ -201,6 +221,11 @@ SOURCE=.\common\event.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\extended.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\fddlgcmn.cpp
 # End Source File
 # Begin Source File
@@ -277,6 +302,10 @@ SOURCE=.\common\hash.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\hashmap.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\helpbase.cpp
 # End Source File
 # Begin Source File
@@ -285,6 +314,10 @@ SOURCE=.\common\http.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\iconbndl.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\imagall.cpp
 # End Source File
 # Begin Source File
@@ -297,10 +330,18 @@ SOURCE=.\common\image.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\imagfill.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\imaggif.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\imagiff.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\imagjpeg.cpp
 # End Source File
 # Begin Source File
@@ -373,19 +414,19 @@ SOURCE=.\common\module.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\mstream.cpp
+SOURCE=.\common\msgout.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\nbkbase.cpp
+SOURCE=.\common\mstream.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\object.cpp
+SOURCE=.\common\nbkbase.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\objstrm.cpp
+SOURCE=.\common\object.cpp
 # End Source File
 # Begin Source File
 
@@ -445,7 +486,7 @@ SOURCE=.\common\sckstrm.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\serbase.cpp
+SOURCE=.\common\settcmn.cpp
 # End Source File
 # Begin Source File
 
@@ -481,6 +522,10 @@ SOURCE=.\common\tbarbase.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\textbuf.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\textcmn.cpp
 # End Source File
 # Begin Source File
@@ -509,6 +554,11 @@ SOURCE=.\common\txtstrm.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\unzip.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\url.cpp
 # End Source File
 # Begin Source File
@@ -559,18 +609,6 @@ SOURCE=.\common\zipstrm.cpp
 
 SOURCE=.\common\zstream.cpp
 # End Source File
-
-# Begin Source File
-
-SOURCE=.\common\extended.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\unzip.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-
 # End Group
 # Begin Group "Generic Files"
 
@@ -597,6 +635,10 @@ SOURCE=.\generic\colrdlgg.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\generic\dcbuffer.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\generic\dcpsg.cpp
 # End Source File
 # Begin Source File
@@ -645,7 +687,7 @@ SOURCE=.\generic\helphtml.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\generic\helpwxht.cpp
+SOURCE=.\generic\imaglist.cpp
 # End Source File
 # Begin Source File
 
@@ -661,6 +703,10 @@ SOURCE=.\generic\logg.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\generic\mdig.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\generic\msgdlgg.cpp
 # End Source File
 # Begin Source File
@@ -747,7 +793,6 @@ SOURCE=.\generic\treelay.cpp
 
 SOURCE=.\generic\wizard.cpp
 # End Source File
-
 # End Group
 # Begin Group "wxHTML Files"
 
@@ -826,24 +871,22 @@ SOURCE=.\html\m_pre.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\html\m_style.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\html\m_tables.cpp
 # End Source File
 # Begin Source File
 
 SOURCE=.\html\winpars.cpp
 # End Source File
-
 # End Group
 # Begin Group "MSW Files"
 
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\msw\dummy.cpp
-# ADD CPP /Yc"wx/wxprec.h"
-# End Source File
-# Begin Source File
-
 SOURCE=.\msw\app.cpp
 # End Source File
 # Begin Source File
@@ -908,6 +951,11 @@ SOURCE=.\msw\dir.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\dummy.cpp
+# ADD CPP /Yc"wx/wxprec.h"
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\evtloop.cpp
 # End Source File
 # Begin Source File
@@ -932,11 +980,17 @@ SOURCE=.\msw\gdiobj.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\icon.cpp
+SOURCE=.\msw\gsocket.c
+# SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\imaglist.cpp
+SOURCE=.\msw\gsockmsw.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\icon.cpp
 # End Source File
 # Begin Source File
 
@@ -956,6 +1010,10 @@ SOURCE=.\msw\pen.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\popupwin.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\regconf.cpp
 # End Source File
 # Begin Source File
@@ -996,24 +1054,32 @@ SOURCE=.\msw\utilsexc.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\volume.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\window.cpp
 # End Source File
+# End Group
+# Begin Group "Universal Files"
+
+# PROP Default_Filter ""
+# Begin Group "Theme Files"
 
+# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\msw\gsocket.c
-# SUBTRACT CPP /YX /Yc /Yu
+SOURCE=.\univ\themes\gtk.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\gsockmsw.c
-# SUBTRACT CPP /YX /Yc /Yu
+SOURCE=.\univ\themes\metal.cpp
 # End Source File
+# Begin Source File
 
+SOURCE=.\univ\themes\win32.cpp
+# End Source File
 # End Group
-# Begin Group "Universal Files"
-
-# PROP Default_Filter ""
 # Begin Source File
 
 SOURCE=.\univ\bmpbuttn.cpp
@@ -1032,6 +1098,10 @@ SOURCE=.\univ\checklst.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\univ\choice.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\univ\colschem.cpp
 # End Source File
 # Begin Source File
@@ -1136,26 +1206,16 @@ SOURCE=.\univ\theme.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\univ\topluniv.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\univ\winuniv.cpp
+SOURCE=.\univ\toolbar.cpp
 # End Source File
-
-# Begin Group "Theme Files"
-
-# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\univ\themes\gtk.cpp
+SOURCE=.\univ\topluniv.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\univ\themes\win32.cpp
+SOURCE=.\univ\winuniv.cpp
 # End Source File
-
-# End Group
 # End Group
 # Begin Group "Headers"
 
@@ -1166,23 +1226,29 @@ SOURCE=.\univ\themes\win32.cpp
 # Begin Source File
 
 SOURCE=..\include\wx\univ\setup.h
+
 !IF  "$(CFG)" == "wxUniv - Win32 Release"
-# Begin Custom Build - Creating wx/setup.h from $(InputPath)
+
+# Begin Custom Build - Creating lib\univ\wx\setup.h from $(InputPath)
 InputPath=..\include\wx\univ\setup.h
 
 "../lib/univ/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy $(InputPath) ..\lib\univ\wx\setup.h
+       copy "$(InputPath)" ..\lib\univ\wx\setup.h
 
 # End Custom Build
+
 !ELSEIF  "$(CFG)" == "wxUniv - Win32 Debug"
-# Begin Custom Build - Creating wx/setup.h from $(InputPath)
+
+# Begin Custom Build - Creating lib\univd\wx\setup.h from $(InputPath)
 InputPath=..\include\wx\univ\setup.h
 
 "../lib/univd/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy $(InputPath) ..\lib\univd\wx\setup.h
+       copy "$(InputPath)" ..\lib\univd\wx\setup.h
 
 # End Custom Build
+
 !ENDIF 
+
 # End Source File
 # End Group
 # Begin Group "Common"
@@ -1198,6 +1264,10 @@ SOURCE=..\include\wx\app.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\artprov.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\bitmap.h
 # End Source File
 # Begin Source File
@@ -1214,6 +1284,10 @@ SOURCE=..\include\wx\buffer.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\build.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\busyinfo.h
 # End Source File
 # Begin Source File
@@ -1350,6 +1424,10 @@ SOURCE=..\include\wx\dc.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\dcbuffer.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\dcclient.h
 # End Source File
 # Begin Source File
@@ -1394,6 +1472,10 @@ SOURCE=..\include\wx\dir.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\dirctrl.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\dirdlg.h
 # End Source File
 # Begin Source File
@@ -1422,6 +1504,10 @@ SOURCE=..\include\wx\dynlib.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\dynload.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\encconv.h
 # End Source File
 # Begin Source File
@@ -1438,6 +1524,10 @@ SOURCE=..\include\wx\fdrepdlg.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\features.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\ffile.h
 # End Source File
 # Begin Source File
@@ -1542,6 +1632,10 @@ SOURCE=..\include\wx\hash.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\hashmap.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\help.h
 # End Source File
 # Begin Source File
@@ -1562,6 +1656,10 @@ SOURCE=..\include\wx\icon.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\iconbndl.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\imagbmp.h
 # End Source File
 # Begin Source File
@@ -1574,6 +1672,10 @@ SOURCE=..\include\wx\imaggif.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\imagiff.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\imagjpeg.h
 # End Source File
 # Begin Source File
@@ -1610,6 +1712,10 @@ SOURCE=..\include\wx\ioswrap.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\ipc.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\ipcbase.h
 # End Source File
 # Begin Source File
@@ -1638,6 +1744,10 @@ SOURCE=..\include\wx\list.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\listbase.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\listbox.h
 # End Source File
 # Begin Source File
@@ -1670,6 +1780,10 @@ SOURCE=..\include\wx\memory.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\memtext.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\menu.h
 # End Source File
 # Begin Source File
@@ -1698,19 +1812,19 @@ SOURCE=..\include\wx\msgdlg.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\mstream.h
+SOURCE=..\include\wx\msgout.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\notebook.h
+SOURCE=..\include\wx\mstream.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\object.h
+SOURCE=..\include\wx\notebook.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\objstrm.h
+SOURCE=..\include\wx\object.h
 # End Source File
 # Begin Source File
 
@@ -1738,6 +1852,10 @@ SOURCE=..\include\wx\pen.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\platform.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\popupwin.h
 # End Source File
 # Begin Source File
@@ -1818,10 +1936,6 @@ SOURCE=..\include\wx\scrolwin.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\serbase.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\settings.h
 # End Source File
 # Begin Source File
@@ -1918,6 +2032,10 @@ SOURCE=..\include\wx\tbarsmpl.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\textbuf.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\textctrl.h
 # End Source File
 # Begin Source File
@@ -2018,6 +2136,10 @@ SOURCE=..\include\wx\version.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\volume.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\wave.h
 # End Source File
 # Begin Source File
@@ -2076,7 +2198,6 @@ SOURCE=..\include\wx\zipstrm.h
 
 SOURCE=..\include\wx\zstream.h
 # End Source File
-
 # End Group
 # Begin Group "MSW"
 
@@ -2155,10 +2276,6 @@ SOURCE=..\include\wx\generic\helphtml.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\generic\helpwxht.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\generic\imaglist.h
 # End Source File
 # Begin Source File
@@ -2219,6 +2336,10 @@ SOURCE=..\include\wx\generic\splitter.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\generic\statline.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\generic\statusbr.h
 # End Source File
 # Begin Source File
@@ -2231,13 +2352,16 @@ SOURCE=..\include\wx\generic\textdlgg.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\generic\timer.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\generic\treectlg.h
 # End Source File
 # Begin Source File
 
 SOURCE=..\include\wx\generic\wizard.h
 # End Source File
-
 # End Group
 # Begin Group "HTML"
 
@@ -2294,7 +2418,6 @@ SOURCE=..\include\wx\html\m_templ.h
 
 SOURCE=..\include\wx\html\winpars.h
 # End Source File
-
 # End Group
 # Begin Group "Universal"