Some more fiddling with two-window approach and

[wxWidgets.git] / src / wxUniv.dsp

diff --git a/src/wxUniv.dsp b/src/wxUniv.dsp
index 7cf3594720b885e75e6bdcf9cc85e6a2c88607e8..448d8e377544a55cea292492fb70d697a176f3a3 100644 (file)
--- a/src/wxUniv.dsp
+++ b/src/wxUniv.dsp
@@ -23,8 +23,8 @@ CFG=wxUniv - Win32 Debug
 
 # Begin Project
 # PROP AllowPerConfigDependencies 0
 
 # Begin Project
 # PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName "wxUniv"
-# PROP Scc_LocalPath ".."
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""

 CPP=cl.exe
 RSC=rc.exe
 
 CPP=cl.exe
 RSC=rc.exe
 


@@ -89,6 +89,18 @@ SOURCE=.\common\appcmn.cpp
 # End Source File
 # Begin Source File
 
 # 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
 SOURCE=.\common\choiccmn.cpp
 # End Source File
 # Begin Source File


@@ -193,6 +205,10 @@ SOURCE=.\common\dynlib.cpp
 # End Source File
 # Begin Source File
 
 # 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
 SOURCE=.\common\effects.cpp
 # End Source File
 # Begin Source File


@@ -281,6 +297,10 @@ SOURCE=.\common\hash.cpp
 # End Source File
 # Begin Source File
 
 # 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
 SOURCE=.\common\helpbase.cpp
 # End Source File
 # Begin Source File


@@ -305,6 +325,10 @@ SOURCE=.\common\imaggif.cpp
 # End Source File
 # Begin Source File
 
 # 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
 SOURCE=.\common\imagjpeg.cpp
 # End Source File
 # Begin Source File


@@ -389,10 +413,6 @@ SOURCE=.\common\object.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\common\objstrm.cpp
-# End Source File
-# Begin Source File
-

 SOURCE=.\common\odbc.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\common\odbc.cpp
 # End Source File
 # Begin Source File


@@ -449,10 +469,6 @@ SOURCE=.\common\sckstrm.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\common\serbase.cpp
-# End Source File
-# Begin Source File
-

 SOURCE=.\common\sizer.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\common\sizer.cpp
 # End Source File
 # Begin Source File


@@ -485,6 +501,10 @@ SOURCE=.\common\tbarbase.cpp
 # End Source File
 # Begin Source File
 
 # 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
 SOURCE=.\common\textcmn.cpp
 # End Source File
 # Begin Source File


@@ -601,6 +621,10 @@ SOURCE=.\generic\colrdlgg.cpp
 # End Source File
 # Begin Source File
 
 # 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
 SOURCE=.\generic\dcpsg.cpp
 # End Source File
 # Begin Source File


@@ -649,10 +673,6 @@ SOURCE=.\generic\helphtml.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\generic\helpwxht.cpp
-# End Source File
-# Begin Source File
-

 SOURCE=.\generic\laywin.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\generic\laywin.cpp
 # End Source File
 # Begin Source File


@@ -830,6 +850,10 @@ SOURCE=.\html\m_pre.cpp
 # End Source File
 # Begin Source File
 
 # 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\m_tables.cpp
 # End Source File
 # Begin Source File


@@ -1000,6 +1024,10 @@ SOURCE=.\msw\utilsexc.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\msw\volume.cpp
+# End Source File
+# Begin Source File
+

 SOURCE=.\msw\window.cpp
 # End Source File
 
 SOURCE=.\msw\window.cpp
 # End Source File
 


@@ -1036,6 +1064,10 @@ SOURCE=.\univ\checklst.cpp
 # End Source File
 # Begin Source File
 
 # 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
 SOURCE=.\univ\colschem.cpp
 # End Source File
 # Begin Source File


@@ -1140,6 +1172,10 @@ SOURCE=.\univ\theme.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\univ\toolbar.cpp
+# End Source File
+# Begin Source File
+

 SOURCE=.\univ\topluniv.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\univ\topluniv.cpp
 # End Source File
 # Begin Source File


@@ -1171,7 +1207,7 @@ SOURCE=.\univ\themes\win32.cpp
 
 SOURCE=..\include\wx\univ\setup.h
 !IF  "$(CFG)" == "wxUniv - Win32 Release"
 
 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)"
 InputPath=..\include\wx\univ\setup.h
 
 "../lib/univ/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"


@@ -1179,7 +1215,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 !ELSEIF  "$(CFG)" == "wxUniv - Win32 Debug"
 
 # 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)"
 InputPath=..\include\wx\univ\setup.h
 
 "../lib/univd/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"


@@ -1202,6 +1238,10 @@ SOURCE=..\include\wx\app.h
 # End Source File
 # Begin Source File
 
 # 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
 SOURCE=..\include\wx\bitmap.h
 # End Source File
 # Begin Source File


@@ -1354,6 +1394,10 @@ SOURCE=..\include\wx\dc.h
 # End Source File
 # Begin Source File
 
 # 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
 SOURCE=..\include\wx\dcclient.h
 # End Source File
 # Begin Source File


@@ -1398,6 +1442,10 @@ SOURCE=..\include\wx\dir.h
 # End Source File
 # Begin Source File
 
 # 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
 SOURCE=..\include\wx\dirdlg.h
 # End Source File
 # Begin Source File


@@ -1426,6 +1474,10 @@ SOURCE=..\include\wx\dynlib.h
 # End Source File
 # Begin Source File
 
 # 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
 SOURCE=..\include\wx\encconv.h
 # End Source File
 # Begin Source File


@@ -1442,6 +1494,10 @@ SOURCE=..\include\wx\fdrepdlg.h
 # End Source File
 # Begin Source File
 
 # 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
 SOURCE=..\include\wx\ffile.h
 # End Source File
 # Begin Source File


@@ -1546,6 +1602,10 @@ SOURCE=..\include\wx\hash.h
 # End Source File
 # Begin Source File
 
 # 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
 SOURCE=..\include\wx\help.h
 # End Source File
 # Begin Source File


@@ -1578,6 +1638,10 @@ SOURCE=..\include\wx\imaggif.h
 # End Source File
 # Begin Source File
 
 # 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
 SOURCE=..\include\wx\imagjpeg.h
 # End Source File
 # Begin Source File


@@ -1674,6 +1738,10 @@ SOURCE=..\include\wx\memory.h
 # End Source File
 # Begin Source File
 
 # 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
 SOURCE=..\include\wx\menu.h
 # End Source File
 # Begin Source File


@@ -1714,10 +1782,6 @@ SOURCE=..\include\wx\object.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\include\wx\objstrm.h
-# End Source File
-# Begin Source File
-

 SOURCE=..\include\wx\odbc.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\odbc.h
 # End Source File
 # Begin Source File


@@ -1826,10 +1890,6 @@ SOURCE=..\include\wx\scrolwin.h
 # End Source File
 # Begin Source File
 
 # 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
 SOURCE=..\include\wx\settings.h
 # End Source File
 # Begin Source File


@@ -1926,6 +1986,10 @@ SOURCE=..\include\wx\tbarsmpl.h
 # End Source File
 # Begin Source File
 
 # 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
 SOURCE=..\include\wx\textctrl.h
 # End Source File
 # Begin Source File


@@ -2026,6 +2090,10 @@ SOURCE=..\include\wx\version.h
 # End Source File
 # Begin Source File
 
 # 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
 SOURCE=..\include\wx\wave.h
 # End Source File
 # Begin Source File


@@ -2163,10 +2231,6 @@ SOURCE=..\include\wx\generic\helphtml.h
 # End Source File
 # Begin Source File
 
 # 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
 SOURCE=..\include\wx\generic\imaglist.h
 # End Source File
 # Begin Source File


@@ -2239,6 +2303,10 @@ SOURCE=..\include\wx\generic\textdlgg.h
 # End Source File
 # Begin Source File
 
 # 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\treectlg.h
 # End Source File
 # Begin Source File