wxCocoa: Added basic (i.e. not working) implementation of wxComboBox

[wxWidgets.git] / src / wxUniv.dsp

diff --git a/src/wxUniv.dsp b/src/wxUniv.dsp
index 2a21340399ed6cf8332a3677f9038f0ba773c39c..866b4f6be02040812620f4619db03bf5ed9a74fd 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
 


@@ -49,7 +49,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib\wxuniv.lib"

 
 !ELSEIF  "$(CFG)" == "wxUniv - Win32 Debug"
 
 
 !ELSEIF  "$(CFG)" == "wxUniv - Win32 Debug"
 


@@ -85,10 +85,30 @@ LIB32=link.exe -lib
 # PROP Default_Filter ""
 # Begin Source File
 
 # PROP Default_Filter ""
 # Begin Source File
 

+SOURCE=.\common\accesscmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\common\appbase.cpp
+# End Source File
+# Begin Source File
+

 SOURCE=.\common\appcmn.cpp
 # End Source File
 # Begin Source File
 
 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
 SOURCE=.\common\choiccmn.cpp
 # End Source File
 # Begin Source File


@@ -97,6 +117,10 @@ SOURCE=.\common\clipcmn.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\common\clntdata.cpp
+# End Source File
+# Begin Source File
+

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


@@ -129,6 +153,10 @@ SOURCE=.\common\ctrlsub.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\common\datacmn.cpp
+# End Source File
+# Begin Source File
+

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


@@ -177,6 +205,14 @@ SOURCE=.\common\docview.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\common\dpycmn.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
 SOURCE=.\common\dynarray.cpp
 # End Source File
 # Begin Source File


@@ -185,20 +221,19 @@ SOURCE=.\common\dynlib.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\common\effects.cpp
+SOURCE=.\common\dynload.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\common\encconv.cpp
+SOURCE=.\common\effects.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\common\event.cpp
+SOURCE=.\common\encconv.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\common\extended.c
-# SUBTRACT CPP /YX /Yc /Yu
+SOURCE=.\common\event.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 


@@ -230,6 +265,14 @@ SOURCE=.\common\filesys.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\common\fldlgcmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\common\fmapbase.cpp
+# End Source File
+# Begin Source File
+

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


@@ -278,6 +321,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


@@ -286,6 +333,10 @@ SOURCE=.\common\http.cpp
 # End Source File
 # Begin Source File
 
 # 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
 SOURCE=.\common\imagall.cpp
 # End Source File
 # Begin Source File


@@ -298,10 +349,18 @@ SOURCE=.\common\image.cpp
 # End Source File
 # Begin Source File
 
 # 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\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
 SOURCE=.\common\imagjpeg.cpp
 # End Source File
 # Begin Source File


@@ -374,23 +433,19 @@ SOURCE=.\common\module.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\common\mstream.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\nbkbase.cpp
+SOURCE=.\common\msgout.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\common\object.cpp
+SOURCE=.\common\mstream.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\common\objstrm.cpp
+SOURCE=.\common\nbkbase.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\common\odbc.cpp
+SOURCE=.\common\object.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 


@@ -426,7 +481,7 @@ SOURCE=.\common\regex.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\common\resource.cpp
+SOURCE=.\common\rgncmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 


@@ -446,7 +501,7 @@ SOURCE=.\common\sckstrm.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\common\serbase.cpp
+SOURCE=.\common\settcmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 


@@ -462,6 +517,10 @@ SOURCE=.\common\statbar.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\common\stopwatch.cpp
+# End Source File
+# Begin Source File
+

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


@@ -478,10 +537,18 @@ SOURCE=.\common\sysopt.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\common\taskbarcmn.cpp
+# End Source File
+# Begin Source File
+

 SOURCE=.\common\tbarbase.cpp
 # End Source File
 # Begin Source File
 
 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
 SOURCE=.\common\textcmn.cpp
 # End Source File
 # Begin Source File


@@ -510,11 +577,6 @@ SOURCE=.\common\txtstrm.cpp
 # End Source File
 # Begin Source File
 
 # 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
 SOURCE=.\common\url.cpp
 # End Source File
 # Begin Source File


@@ -551,10 +613,6 @@ SOURCE=.\common\wxchar.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -565,6 +623,18 @@ SOURCE=.\common\zipstrm.cpp
 
 SOURCE=.\common\zstream.cpp
 # End Source File
 
 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"
 
 # End Group
 # Begin Group "Generic Files"
 


@@ -591,15 +661,15 @@ SOURCE=.\generic\colrdlgg.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\generic\dcpsg.cpp
+SOURCE=.\generic\dcbuffer.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\generic\dirctrlg.cpp
+SOURCE=.\generic\dcpsg.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\generic\dirdlgg.cpp
+SOURCE=.\generic\dirctrlg.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 


@@ -635,11 +705,7 @@ SOURCE=.\generic\helpext.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 


@@ -655,6 +721,10 @@ SOURCE=.\generic\logg.cpp
 # End Source File
 # Begin Source File
 
 # 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
 SOURCE=.\generic\msgdlgg.cpp
 # End Source File
 # Begin Source File


@@ -679,23 +749,15 @@ SOURCE=.\generic\progdlgg.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\generic\prop.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\generic\propform.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\generic\proplist.cpp
+SOURCE=.\generic\sashwin.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\generic\sashwin.cpp
+SOURCE=.\generic\scrlwing.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\generic\scrlwing.cpp
+SOURCE=.\generic\selstore.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 


@@ -735,12 +797,9 @@ SOURCE=.\generic\treectlg.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

 SOURCE=.\generic\wizard.cpp
 # End Source File
 SOURCE=.\generic\wizard.cpp
 # End Source File

+

 # End Group
 # Begin Group "wxHTML Files"
 
 # End Group
 # Begin Group "wxHTML Files"
 


@@ -811,11 +870,11 @@ SOURCE=.\html\m_list.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\html\m_meta.cpp
+SOURCE=.\html\m_pre.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\html\m_pre.cpp
+SOURCE=.\html\m_style.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 


@@ -825,16 +884,26 @@ SOURCE=.\html\m_tables.cpp
 
 SOURCE=.\html\winpars.cpp
 # End Source File
 
 SOURCE=.\html\winpars.cpp
 # End Source File

+

 # End Group
 # Begin Group "MSW Files"
 
 # PROP Default_Filter ""
 # Begin 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
 
 SOURCE=.\msw\app.cpp
 # End Source File
 # Begin Source File
 

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

 SOURCE=.\msw\bitmap.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\msw\bitmap.cpp
 # End Source File
 # Begin Source File


@@ -887,6 +956,10 @@ SOURCE=.\msw\dde.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

 SOURCE=.\msw\dib.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\msw\dib.cpp
 # End Source File
 # Begin Source File


@@ -895,8 +968,15 @@ SOURCE=.\msw\dir.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\msw\dummy.cpp
-# ADD CPP /Yc"wx/wxprec.h"
+SOURCE=.\msw\dirdlg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\display.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\enhmeta.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 


@@ -924,13 +1004,19 @@ SOURCE=.\msw\gdiobj.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\msw\gsocket.c
-# SUBTRACT CPP /YX /Yc /Yu
+SOURCE=.\msw\glcanvas.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\msw\gsockmsw.c
-# SUBTRACT CPP /YX /Yc /Yu
+SOURCE=.\msw\helpbest.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\helpchm.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\helpwin.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 


@@ -938,7 +1024,7 @@ SOURCE=.\msw\icon.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\msw\imaglist.cpp
+SOURCE=.\msw\joystick.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 


@@ -950,6 +1036,14 @@ SOURCE=.\msw\mimetype.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

 SOURCE=.\msw\palette.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\msw\palette.cpp
 # End Source File
 # Begin Source File


@@ -958,6 +1052,10 @@ SOURCE=.\msw\pen.cpp
 # End Source File
 # Begin Source File
 
 # 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
 SOURCE=.\msw\regconf.cpp
 # End Source File
 # Begin Source File


@@ -978,6 +1076,10 @@ SOURCE=.\msw\snglinst.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

 SOURCE=.\msw\thread.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\msw\thread.cpp
 # End Source File
 # Begin Source File


@@ -986,6 +1088,10 @@ SOURCE=.\msw\timer.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

 SOURCE=.\msw\toplevel.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\msw\toplevel.cpp
 # End Source File
 # Begin Source File


@@ -998,24 +1104,65 @@ SOURCE=.\msw\utilsexc.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\msw\utilsgui.cpp
+# End Source File
+# Begin Source File
+
+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
 SOURCE=.\msw\window.cpp
 # End Source File

-# End Group
-# Begin Group "Universal Files"

 
 

-# PROP Default_Filter ""
-# Begin Group "Theme Files"
+# Begin Source File
+
+SOURCE=.\msw\gsocket.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\gsockmsw.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+
+# Begin Group "OLE Files"

 
 # PROP Default_Filter ""
 # Begin Source File
 
 
 # PROP Default_Filter ""
 # Begin Source File
 

-SOURCE=.\univ\themes\gtk.cpp
+SOURCE=.\msw\ole\automtn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\univ\themes\win32.cpp
+SOURCE=.\msw\ole\dataobj.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\ole\dropsrc.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\ole\droptgt.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\ole\oleutils.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\ole\uuid.cpp

 # End Source File
 # End Source File

+

 # End Group
 # End Group

+# End Group
+# Begin Group "Universal Files"
+
+# PROP Default_Filter ""

 # Begin Source File
 
 SOURCE=.\univ\bmpbuttn.cpp
 # Begin Source File
 
 SOURCE=.\univ\bmpbuttn.cpp


@@ -1034,6 +1181,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


@@ -1138,12 +1289,34 @@ 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\winuniv.cpp
 # End Source File
 SOURCE=.\univ\topluniv.cpp
 # End Source File
 # Begin Source File
 
 SOURCE=.\univ\winuniv.cpp
 # End Source File

+
+# Begin Group "Theme Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\univ\themes\gtk.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\univ\themes\metal.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\univ\themes\win32.cpp
+# End Source File
+
+# End Group

 # End Group
 # Begin Group "Headers"
 
 # End Group
 # Begin Group "Headers"
 


@@ -1154,29 +1327,23 @@ SOURCE=.\univ\winuniv.cpp
 # Begin Source File
 
 SOURCE=..\include\wx\univ\setup.h
 # Begin Source File
 
 SOURCE=..\include\wx\univ\setup.h

-

 !IF  "$(CFG)" == "wxUniv - Win32 Release"
 !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)"

-       copy $(InputPath) ..\lib\univ\wx\setup.h
+       copy "$(InputPath)" ..\lib\univ\wx\setup.h

 
 # End Custom Build
 
 # End Custom Build

-

 !ELSEIF  "$(CFG)" == "wxUniv - Win32 Debug"
 !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)"

-       copy $(InputPath) ..\lib\univd\wx\setup.h
+       copy "$(InputPath)" ..\lib\univd\wx\setup.h

 
 # End Custom Build
 
 # End Custom Build

-

 !ENDIF 
 !ENDIF 

-

 # End Source File
 # End Group
 # Begin Group "Common"
 # End Source File
 # End Group
 # Begin Group "Common"


@@ -1188,10 +1355,22 @@ SOURCE=..\include\wx\accel.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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

+SOURCE=..\include\wx\apptrait.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
 SOURCE=..\include\wx\bitmap.h
 # End Source File
 # Begin Source File


@@ -1208,6 +1387,10 @@ SOURCE=..\include\wx\buffer.h
 # End Source File
 # Begin Source File
 
 # 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
 SOURCE=..\include\wx\busyinfo.h
 # End Source File
 # Begin Source File


@@ -1248,6 +1431,10 @@ SOURCE=..\include\wx\clipbrd.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -1304,10 +1491,6 @@ SOURCE=..\include\wx\dataobj.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -1340,6 +1523,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


@@ -1384,10 +1571,18 @@ 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
 

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

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


@@ -1412,6 +1607,14 @@ 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\effects.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


@@ -1420,11 +1623,11 @@ SOURCE=..\include\wx\event.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\include\wx\expr.h
+SOURCE=..\include\wx\fdrepdlg.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\include\wx\fdrepdlg.h
+SOURCE=..\include\wx\features.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 


@@ -1456,6 +1659,10 @@ SOURCE=..\include\wx\filesys.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -1532,15 +1739,15 @@ SOURCE=..\include\wx\hash.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\include\wx\help.h
+SOURCE=..\include\wx\hashmap.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\include\wx\helpbase.h
+SOURCE=..\include\wx\help.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\include\wx\helphtml.h
+SOURCE=..\include\wx\helpbase.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 


@@ -1552,6 +1759,10 @@ SOURCE=..\include\wx\icon.h
 # End Source File
 # Begin Source File
 
 # 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
 SOURCE=..\include\wx\imagbmp.h
 # End Source File
 # Begin Source File


@@ -1564,6 +1775,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


@@ -1596,10 +1811,18 @@ SOURCE=..\include\wx\intl.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

 SOURCE=..\include\wx\ioswrap.h
 # End Source File
 # Begin Source File
 
 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
 SOURCE=..\include\wx\ipcbase.h
 # End Source File
 # Begin Source File


@@ -1628,6 +1851,10 @@ SOURCE=..\include\wx\list.h
 # End Source File
 # Begin Source File
 
 # 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
 SOURCE=..\include\wx\listbox.h
 # End Source File
 # Begin Source File


@@ -1644,6 +1871,10 @@ SOURCE=..\include\wx\longlong.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -1660,6 +1891,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


@@ -1688,23 +1923,19 @@ SOURCE=..\include\wx\msgdlg.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\include\wx\mstream.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\notebook.h
+SOURCE=..\include\wx\msgout.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\include\wx\object.h
+SOURCE=..\include\wx\mstream.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\include\wx\objstrm.h
+SOURCE=..\include\wx\notebook.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\include\wx\odbc.h
+SOURCE=..\include\wx\object.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 


@@ -1728,6 +1959,10 @@ SOURCE=..\include\wx\pen.h
 # End Source File
 # Begin Source File
 
 # 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
 SOURCE=..\include\wx\popupwin.h
 # End Source File
 # Begin Source File


@@ -1752,15 +1987,7 @@ SOURCE=..\include\wx\progdlg.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\include\wx\prop.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\propform.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\proplist.h
+SOURCE=..\include\wx\quantize.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 


@@ -1772,15 +1999,15 @@ SOURCE=..\include\wx\radiobut.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\include\wx\regex.h
+SOURCE=..\include\wx\rawbmp.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\include\wx\region.h
+SOURCE=..\include\wx\regex.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\include\wx\resource.h
+SOURCE=..\include\wx\region.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 


@@ -1808,7 +2035,7 @@ SOURCE=..\include\wx\scrolwin.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\include\wx\serbase.h
+SOURCE=..\include\wx\selstore.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 


@@ -1908,6 +2135,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


@@ -1928,10 +2159,6 @@ SOURCE=..\include\wx\thread.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -2008,6 +2235,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


@@ -2044,10 +2275,6 @@ SOURCE=..\include\wx\wxchar.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -2066,6 +2293,7 @@ SOURCE=..\include\wx\zipstrm.h
 
 SOURCE=..\include\wx\zstream.h
 # End Source File
 
 SOURCE=..\include\wx\zstream.h
 # End Source File

+

 # End Group
 # Begin Group "MSW"
 
 # End Group
 # Begin Group "MSW"
 


@@ -2140,14 +2368,6 @@ SOURCE=..\include\wx\generic\helpext.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-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
 SOURCE=..\include\wx\generic\imaglist.h
 # End Source File
 # Begin Source File


@@ -2160,6 +2380,10 @@ SOURCE=..\include\wx\generic\listctrl.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\generic\mdig.h
+# End Source File
+# Begin Source File
+

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


@@ -2196,6 +2420,10 @@ SOURCE=..\include\wx\generic\scrolwin.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\generic\spinctlg.h
+# End Source File
+# Begin Source File
+

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


@@ -2204,6 +2432,10 @@ SOURCE=..\include\wx\generic\splitter.h
 # End Source File
 # Begin Source File
 
 # 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
 SOURCE=..\include\wx\generic\statusbr.h
 # End Source File
 # Begin Source File


@@ -2216,12 +2448,17 @@ 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\wizard.h
 # End 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"
 
 # End Group
 # Begin Group "HTML"
 


@@ -2278,6 +2515,7 @@ SOURCE=..\include\wx\html\m_templ.h
 
 SOURCE=..\include\wx\html\winpars.h
 # End Source File
 
 SOURCE=..\include\wx\html\winpars.h
 # End Source File

+

 # End Group
 # Begin Group "Universal"
 
 # End Group
 # Begin Group "Universal"