Updates to VC++ project files

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3776 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/wxvc.dsp b/src/wxvc.dsp
index 3675e3241b191a8b54e0623c9597060e45642c80..bdc9b9f0e9947a622636f2a314797e21d00ac84f 100644 (file)
--- a/src/wxvc.dsp
+++ b/src/wxvc.dsp
@@ -1,7 +1,6 @@
 # Microsoft Developer Studio Project File - Name="wxvc" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 5.00
 # ** DO NOT EDIT **
-# RCS-ID:      $Id$
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 
@@ -171,6 +170,10 @@ SOURCE=.\common\filesys.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\fontcmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\framecmn.cpp
 # End Source File
 # Begin Source File
@@ -333,15 +336,15 @@ SOURCE=.\common\socket.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\stream.cpp
+SOURCE=.\common\strconv.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\string.cpp
+SOURCE=.\common\stream.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\strconv.cpp
+SOURCE=.\common\string.cpp
 # End Source File
 # Begin Source File
 
@@ -448,6 +451,14 @@ SOURCE=.\generic\gridg.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\generic\helpext.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\generic\helphtml.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\generic\helpwxht.cpp
 # End Source File
 # Begin Source File
@@ -456,6 +467,10 @@ SOURCE=.\generic\laywin.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\generic\logg.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\generic\numdlgg.cpp
 # End Source File
 # Begin Source File
@@ -616,6 +631,10 @@ SOURCE=.\msw\button.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\caret.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\checkbox.cpp
 # End Source File
 # Begin Source File
@@ -737,6 +756,11 @@ SOURCE=.\msw\gdiobj.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\gsocket.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\helpwin.cpp
 # End Source File
 # Begin Source File
@@ -892,11 +916,11 @@ SOURCE=.\msw\statbr95.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\stattext.cpp
+SOURCE=.\msw\statline.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\statline.cpp
+SOURCE=.\msw\stattext.cpp
 # End Source File
 # Begin Source File
 
@@ -990,19 +1014,8 @@ SOURCE=.\msw\ole\uuid.cpp
 # Begin Source File
 
 SOURCE=.\png\png.c
-
-!IF  "$(CFG)" == "wxvc - Win32 Release"
-
-# ADD CPP /I "../include zlib"
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc - Win32 Debug"
-
 # ADD CPP /I "zlib"
 # SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
 # End Source File
 # Begin Source File
 
@@ -1015,240 +1028,86 @@ SOURCE=.\png\pngconf.h
 # Begin Source File
 
 SOURCE=.\png\pngerror.c
-
-!IF  "$(CFG)" == "wxvc - Win32 Release"
-
-# ADD CPP /I "../include zlib"
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc - Win32 Debug"
-
 # ADD CPP /I "zlib"
 # SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
 # End Source File
 # Begin Source File
 
 SOURCE=.\png\pngget.c
-
-!IF  "$(CFG)" == "wxvc - Win32 Release"
-
-# ADD CPP /I "../include zlib"
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc - Win32 Debug"
-
 # ADD CPP /I "zlib"
 # SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
 # End Source File
 # Begin Source File
 
 SOURCE=.\png\pngmem.c
-
-!IF  "$(CFG)" == "wxvc - Win32 Release"
-
-# ADD CPP /I "../include zlib"
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc - Win32 Debug"
-
 # ADD CPP /I "zlib"
 # SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
 # End Source File
 # Begin Source File
 
 SOURCE=.\png\pngpread.c
-
-!IF  "$(CFG)" == "wxvc - Win32 Release"
-
-# ADD CPP /I "../include zlib"
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc - Win32 Debug"
-
 # ADD CPP /I "zlib"
 # SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
 # End Source File
 # Begin Source File
 
 SOURCE=.\png\pngread.c
-
-!IF  "$(CFG)" == "wxvc - Win32 Release"
-
-# ADD CPP /I "../include zlib"
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc - Win32 Debug"
-
 # ADD CPP /I "zlib"
 # SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
 # End Source File
 # Begin Source File
 
 SOURCE=.\png\pngrio.c
-
-!IF  "$(CFG)" == "wxvc - Win32 Release"
-
-# ADD CPP /I "../include zlib"
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc - Win32 Debug"
-
 # ADD CPP /I "zlib"
 # SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
 # End Source File
 # Begin Source File
 
 SOURCE=.\png\pngrtran.c
-
-!IF  "$(CFG)" == "wxvc - Win32 Release"
-
-# ADD CPP /I "../include zlib"
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc - Win32 Debug"
-
 # ADD CPP /I "zlib"
 # SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
 # End Source File
 # Begin Source File
 
 SOURCE=.\png\pngrutil.c
-
-!IF  "$(CFG)" == "wxvc - Win32 Release"
-
-# ADD CPP /I "../include zlib"
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc - Win32 Debug"
-
 # ADD CPP /I "zlib"
 # SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
 # End Source File
 # Begin Source File
 
 SOURCE=.\png\pngset.c
-
-!IF  "$(CFG)" == "wxvc - Win32 Release"
-
-# ADD CPP /I "../include zlib"
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc - Win32 Debug"
-
 # ADD CPP /I "zlib"
 # SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
 # End Source File
 # Begin Source File
 
 SOURCE=.\png\pngtrans.c
-
-!IF  "$(CFG)" == "wxvc - Win32 Release"
-
-# ADD CPP /I "../include zlib"
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc - Win32 Debug"
-
 # ADD CPP /I "zlib"
 # SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
 # End Source File
 # Begin Source File
 
 SOURCE=.\png\pngwio.c
-
-!IF  "$(CFG)" == "wxvc - Win32 Release"
-
-# ADD CPP /I "../include zlib"
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc - Win32 Debug"
-
 # ADD CPP /I "zlib"
 # SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
 # End Source File
 # Begin Source File
 
 SOURCE=.\png\pngwrite.c
-
-!IF  "$(CFG)" == "wxvc - Win32 Release"
-
-# ADD CPP /I "../include zlib"
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc - Win32 Debug"
-
 # ADD CPP /I "zlib"
 # SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
 # End Source File
 # Begin Source File
 
 SOURCE=.\png\pngwtran.c
-
-!IF  "$(CFG)" == "wxvc - Win32 Release"
-
-# ADD CPP /I "../include zlib"
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc - Win32 Debug"
-
 # ADD CPP /I "zlib"
 # SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
 # End Source File
 # Begin Source File
 
 SOURCE=.\png\pngwutil.c
-
-!IF  "$(CFG)" == "wxvc - Win32 Release"
-
-# ADD CPP /I "../include zlib"
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc - Win32 Debug"
-
 # ADD CPP /I "zlib"
 # SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
 # End Source File
 # End Group
 # Begin Group "XPM files"

diff --git a/src/wxvc6.dsp b/src/wxvc6.dsp
index 0cbad67655cc91a157f3b7ac22e19676a54a0e1b..d3b061a5fbe89ffc3e328bcb75c3b424c9ef8b1d 100644 (file)
--- a/src/wxvc6.dsp
+++ b/src/wxvc6.dsp
@@ -1,7 +1,6 @@
 # Microsoft Developer Studio Project File - Name="wxvc6" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
-# RCS-ID:      $Id$
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 
@@ -177,6 +176,10 @@ SOURCE=.\common\filesys.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\fontcmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\framecmn.cpp
 # End Source File
 # Begin Source File
@@ -463,6 +466,14 @@ SOURCE=.\generic\gridg.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\generic\helpext.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\generic\helphtml.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\generic\helpwxht.cpp
 # End Source File
 # Begin Source File
@@ -471,6 +482,10 @@ SOURCE=.\generic\laywin.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\generic\logg.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\generic\numdlgg.cpp
 # End Source File
 # Begin Source File
@@ -631,6 +646,10 @@ SOURCE=.\msw\button.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\caret.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\checkbox.cpp
 # End Source File
 # Begin Source File
@@ -752,6 +771,11 @@ SOURCE=.\msw\gdiobj.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\gsocket.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\helpwin.cpp
 # End Source File
 # Begin Source File
@@ -907,11 +931,11 @@ SOURCE=.\msw\statbr95.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\stattext.cpp
+SOURCE=.\msw\statline.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\statline.cpp
+SOURCE=.\msw\stattext.cpp
 # End Source File
 # Begin Source File
 

diff --git a/src/wxvc_dll.dsp b/src/wxvc_dll.dsp
index 0dc988996374de8a73721db80077b78cdf9f418a..03cbcee5275cdf384fdd25d3fa00215ba2de6165 100644 (file)
--- a/src/wxvc_dll.dsp
+++ b/src/wxvc_dll.dsp
@@ -108,10 +108,6 @@ SOURCE=.\common\ctrlcmn.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\dcbase.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\common\date.cpp
 # End Source File
 # Begin Source File
@@ -128,6 +124,10 @@ SOURCE=.\common\dbtable.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\dcbase.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\dlgcmn.cpp
 # End Source File
 # Begin Source File
@@ -163,11 +163,11 @@ SOURCE=.\common\extended.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\file.cpp
+SOURCE=.\common\ffile.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\ffile.cpp
+SOURCE=.\common\file.cpp
 # End Source File
 # Begin Source File
 
@@ -183,6 +183,10 @@ SOURCE=.\common\filesys.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\fontcmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\framecmn.cpp
 # End Source File
 # Begin Source File
@@ -219,11 +223,11 @@ SOURCE=.\common\http.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\image.cpp
+SOURCE=.\common\imagbmp.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\imagbmp.cpp
+SOURCE=.\common\image.cpp
 # End Source File
 # Begin Source File
 
@@ -344,15 +348,15 @@ SOURCE=.\common\socket.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\stream.cpp
+SOURCE=.\common\strconv.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\string.cpp
+SOURCE=.\common\stream.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\strconv.cpp
+SOURCE=.\common\string.cpp
 # End Source File
 # Begin Source File
 
@@ -388,6 +392,12 @@ SOURCE=.\common\txtstrm.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\unzip.c
+# ADD CPP /I "zlib"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\url.cpp
 # End Source File
 # Begin Source File
@@ -429,6 +439,7 @@ SOURCE=.\common\wxexpr.cpp
 # Begin Source File
 
 SOURCE=.\common\zipstrm.cpp
+# ADD CPP /I "zlib"
 # End Source File
 # Begin Source File
 
@@ -440,11 +451,11 @@ SOURCE=.\common\zstream.cpp
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\generic\choicdgg.cpp
+SOURCE=.\generic\busyinfo.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\generic\busyinfo.cpp
+SOURCE=.\generic\choicdgg.cpp
 # End Source File
 # Begin Source File
 
@@ -452,6 +463,14 @@ SOURCE=.\generic\gridg.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\generic\helpext.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\generic\helphtml.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\generic\helpwxht.cpp
 # End Source File
 # Begin Source File
@@ -460,6 +479,10 @@ SOURCE=.\generic\laywin.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\generic\logg.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\generic\numdlgg.cpp
 # End Source File
 # Begin Source File
@@ -511,7 +534,6 @@ SOURCE=.\generic\textdlgg.cpp
 SOURCE=.\generic\tipdlg.cpp
 # End Source File
 # End Group
-
 # Begin Group "wxHTML Files"
 
 # PROP Default_Filter ""
@@ -588,7 +610,6 @@ SOURCE=.\html\mod_tables.cpp
 SOURCE=.\html\search.cpp
 # End Source File
 # End Group
-
 # Begin Group "MSW Files"
 
 # PROP Default_Filter ""
@@ -618,6 +639,10 @@ SOURCE=.\msw\button.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\caret.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\checkbox.cpp
 # End Source File
 # Begin Source File
@@ -739,6 +764,11 @@ SOURCE=.\msw\gdiobj.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\gsocket.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\helpwin.cpp
 # End Source File
 # Begin Source File
@@ -884,6 +914,10 @@ SOURCE=.\msw\statbr95.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\statline.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\stattext.cpp
 # End Source File
 # Begin Source File