applied patch for compilation with gcc 3.0

[wxWidgets.git] / src / wxvc_dll.dsp

diff --git a/src/wxvc_dll.dsp b/src/wxvc_dll.dsp
index eab6437c6e1e3db68877a8a9a9df460c59308c1c..9fe23cf9c1f56d8e483265a677523310b3b99b1f 100644 (file)
--- a/src/wxvc_dll.dsp
+++ b/src/wxvc_dll.dsp
@@ -7,19 +7,19 @@
 CFG=wxvc_dll - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "wxvc_dll.mak".
-!MESSAGE 
+!MESSAGE
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "wxvc_dll.mak" CFG="wxvc_dll - Win32 Debug"
-!MESSAGE 
+!MESSAGE
 !MESSAGE Possible choices for configuration are:
-!MESSAGE 
+!MESSAGE
 !MESSAGE "wxvc_dll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "wxvc_dll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
+!MESSAGE
 
 # Begin Project
 # PROP AllowPerConfigDependencies 0
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib rpcrt4.lib winmm.lib opengl32.lib glu32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"../lib/wx22_0.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib rpcrt4.lib winmm.lib opengl32.lib glu32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"../lib/wx23_1.dll"
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -79,9 +79,9 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib rpcrt4.lib winmm.lib opengl32.lib glu32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"../lib/wx22_0d.dll" /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib rpcrt4.lib winmm.lib opengl32.lib glu32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"../lib/wx23_1d.dll" /pdbtype:sept
 
-!ENDIF 
+!ENDIF
 
 # Begin Target
 
@@ -116,6 +116,10 @@ SOURCE=.\common\config.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\cshelp.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\ctrlcmn.cpp
 # End Source File
 # Begin Source File
@@ -144,6 +148,10 @@ SOURCE=.\common\dcbase.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\dircmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\dlgcmn.cpp
 # End Source File
 # Begin Source File
@@ -207,6 +215,10 @@ SOURCE=.\common\filefn.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\filename.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\filesys.cpp
 # End Source File
 # Begin Source File
@@ -299,6 +311,10 @@ SOURCE=.\common\imagtiff.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\imagxpm.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\intl.cpp
 # End Source File
 # Begin Source File
@@ -505,6 +521,10 @@ SOURCE=.\common\wxexpr.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\xpmdecod.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\zipstrm.cpp
 # ADD CPP /I "zlib"
 # End Source File
@@ -570,10 +590,6 @@ SOURCE=.\generic\panelg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\generic\plot.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\generic\progdlgg.cpp
 # End Source File
 # Begin Source File
@@ -626,6 +642,10 @@ SOURCE=.\generic\tipdlg.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\generic\tipwin.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\generic\treectlg.cpp
 # End Source File
 # Begin Source File
@@ -1089,6 +1109,10 @@ SOURCE=.\msw\textctrl.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\tglbtn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\thread.cpp
 # End Source File
 # Begin Source File
@@ -1119,11 +1143,6 @@ SOURCE=.\msw\wave.cpp
 
 SOURCE=.\msw\window.cpp
 # End Source File
-# Begin Source File
-
-SOURCE=.\msw\xpmhand.cpp
-# ADD CPP /I "../src/xpm"
-# End Source File
 # End Group
 # Begin Group "OLE Files"
 
@@ -1253,105 +1272,6 @@ SOURCE=.\png\pngwutil.c
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # End Group
-# Begin Group "XPM Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\xpm\attrib.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\crbuffri.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\crdatfri.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\create.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\crifrbuf.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\crifrdat.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\dataxpm.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\hashtab.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\imagexpm.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\info.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\misc.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\parse.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\rdftodat.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\rdftoi.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\rgb.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\scan.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\simx.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\wrffrdat.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\wrffri.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# End Group
 # Begin Group "Zlib Files"
 
 # PROP Default_Filter ""
@@ -1451,7 +1371,7 @@ SOURCE=.\jpeg\jcapimin.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1468,7 +1388,7 @@ SOURCE=.\jpeg\jcapistd.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1485,7 +1405,7 @@ SOURCE=.\jpeg\jccoefct.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1502,7 +1422,7 @@ SOURCE=.\jpeg\jccolor.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1519,7 +1439,7 @@ SOURCE=.\jpeg\jcdctmgr.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1536,7 +1456,7 @@ SOURCE=.\jpeg\jchuff.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1553,7 +1473,7 @@ SOURCE=.\jpeg\jcinit.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1570,7 +1490,7 @@ SOURCE=.\jpeg\jcmainct.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1587,7 +1507,7 @@ SOURCE=.\jpeg\jcmarker.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1604,7 +1524,7 @@ SOURCE=.\jpeg\jcmaster.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1621,7 +1541,7 @@ SOURCE=.\jpeg\jcomapi.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1638,7 +1558,7 @@ SOURCE=.\jpeg\jcparam.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1655,7 +1575,7 @@ SOURCE=.\jpeg\jcphuff.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1672,7 +1592,7 @@ SOURCE=.\jpeg\jcprepct.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1689,7 +1609,7 @@ SOURCE=.\jpeg\jcsample.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1706,7 +1626,7 @@ SOURCE=.\jpeg\jctrans.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1723,7 +1643,7 @@ SOURCE=.\jpeg\jdapimin.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1740,7 +1660,7 @@ SOURCE=.\jpeg\jdapistd.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1757,7 +1677,7 @@ SOURCE=.\jpeg\jdatadst.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1774,7 +1694,7 @@ SOURCE=.\jpeg\jdatasrc.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1791,7 +1711,7 @@ SOURCE=.\jpeg\jdcoefct.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1808,7 +1728,7 @@ SOURCE=.\jpeg\jdcolor.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1825,7 +1745,7 @@ SOURCE=.\jpeg\jddctmgr.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1842,7 +1762,7 @@ SOURCE=.\jpeg\jdhuff.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1859,7 +1779,7 @@ SOURCE=.\jpeg\jdinput.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1876,7 +1796,7 @@ SOURCE=.\jpeg\jdmainct.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1893,7 +1813,7 @@ SOURCE=.\jpeg\jdmarker.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1910,7 +1830,7 @@ SOURCE=.\jpeg\jdmaster.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1927,7 +1847,7 @@ SOURCE=.\jpeg\jdmerge.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1944,7 +1864,7 @@ SOURCE=.\jpeg\jdphuff.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1961,7 +1881,7 @@ SOURCE=.\jpeg\jdpostct.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1978,7 +1898,7 @@ SOURCE=.\jpeg\jdsample.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1995,7 +1915,7 @@ SOURCE=.\jpeg\jdtrans.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -2012,7 +1932,7 @@ SOURCE=.\jpeg\jerror.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -2029,7 +1949,7 @@ SOURCE=.\jpeg\jfdctflt.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -2046,7 +1966,7 @@ SOURCE=.\jpeg\jfdctfst.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -2063,7 +1983,7 @@ SOURCE=.\jpeg\jfdctint.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -2080,7 +2000,7 @@ SOURCE=.\jpeg\jidctflt.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -2097,7 +2017,7 @@ SOURCE=.\jpeg\jidctfst.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -2114,7 +2034,7 @@ SOURCE=.\jpeg\jidctint.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -2131,7 +2051,7 @@ SOURCE=.\jpeg\jidctred.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -2148,7 +2068,7 @@ SOURCE=.\jpeg\jmemmgr.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -2165,7 +2085,7 @@ SOURCE=.\jpeg\jmemnobs.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -2182,7 +2102,7 @@ SOURCE=.\jpeg\jquant1.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -2199,7 +2119,7 @@ SOURCE=.\jpeg\jquant2.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -2216,7 +2136,7 @@ SOURCE=.\jpeg\jutils.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # End Group