fixed bug in wxSemaphore::WaitTimeout() which was calling the wrong wxCondition:...

[wxWidgets.git] / src / wxUniv.dsp

diff --git a/src/wxUniv.dsp b/src/wxUniv.dsp
index 0cacb9f8c0f4e8dfb03aed83cf3d7cf18cfbc0f5..3852dba726ef3042bb760151a453147a650a55db 100644 (file)
--- a/src/wxUniv.dsp
+++ b/src/wxUniv.dsp
@@ -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


@@ -289,6 +309,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


@@ -301,10 +325,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


@@ -377,19 +409,19 @@ SOURCE=.\common\module.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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

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

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

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

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

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

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


@@ -449,7 +481,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
 


@@ -485,6 +517,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 +637,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


@@ -621,10 +661,6 @@ SOURCE=.\generic\fdrepdlg.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -649,7 +685,7 @@ SOURCE=.\generic\helphtml.cpp
 # End Source File
 # Begin Source File
 
 # 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
 


@@ -665,6 +701,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


@@ -822,11 +862,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
 


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

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

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


@@ -940,10 +984,6 @@ SOURCE=.\msw\icon.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\msw\imaglist.cpp
-# End Source File
-# Begin Source File
-

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


@@ -960,6 +1000,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


@@ -1000,6 +1044,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 +1084,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 +1192,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


@@ -1156,6 +1212,10 @@ SOURCE=.\univ\themes\gtk.cpp
 # End Source File
 # Begin Source File
 
 # 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
 
 SOURCE=.\univ\themes\win32.cpp
 # End Source File
 


@@ -1171,19 +1231,19 @@ 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)"

-       copy $(InputPath) ..\lib\univ\wx\setup.h
+       copy "$(InputPath)" ..\lib\univ\wx\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)"

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

 
 # End Custom Build
 !ENDIF 
 
 # End Custom Build
 !ENDIF 


@@ -1202,6 +1262,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


@@ -1218,6 +1282,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


@@ -1354,6 +1422,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 +1470,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 +1502,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


@@ -1442,6 +1526,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 +1634,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


@@ -1566,6 +1658,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


@@ -1578,6 +1674,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


@@ -1614,6 +1714,10 @@ SOURCE=..\include\wx\ioswrap.h
 # End Source File
 # Begin Source File
 
 # 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


@@ -1642,6 +1746,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


@@ -1674,6 +1782,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


@@ -1702,19 +1814,19 @@ SOURCE=..\include\wx\msgdlg.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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

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

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

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

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

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

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


@@ -1826,10 +1938,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 +2034,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 +2138,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 +2279,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


@@ -2179,6 +2291,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


@@ -2227,6 +2343,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


@@ -2239,6 +2359,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