drawing mono bitmaps now uses correct colours

[wxWidgets.git] / src / wxvc_dll.dsp

diff --git a/src/wxvc_dll.dsp b/src/wxvc_dll.dsp
index 90d29108931a52e1578bfb43543236bb4b357adb..ee493b4fb80bca5af763fdba80dd222a930f4984 100644 (file)
--- a/src/wxvc_dll.dsp
+++ b/src/wxvc_dll.dsp
@@ -264,21 +264,21 @@ SOURCE=.\common\imaggif.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\imagpcx.cpp
+SOURCE=.\common\imagjpeg.cpp
+# ADD CPP /I "../src/jpeg"
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\imagpnm.cpp
+SOURCE=.\common\imagpcx.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\imagjpeg.cpp
-# ADD CPP /I "../src/jpeg"
+SOURCE=.\common\imagpng.cpp
+# ADD CPP /I "png" /I "zlib"
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\imagpng.cpp
-# ADD CPP /I "png" /I "zlib"
+SOURCE=.\common\imagpnm.cpp
 # End Source File
 # Begin Source File
 
@@ -502,6 +502,10 @@ SOURCE=.\generic\busyinfo.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\generic\calctrl.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\generic\choicdgg.cpp
 # End Source File
 # Begin Source File
@@ -626,6 +630,10 @@ SOURCE=.\html\htmprint.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\html\m_dflist.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\html\m_fonts.cpp
 # End Source File
 # Begin Source File
@@ -650,10 +658,6 @@ SOURCE=.\html\m_list.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\html\m_dflist.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\html\m_pre.cpp
 # End Source File
 # Begin Source File
@@ -795,6 +799,10 @@ SOURCE=.\msw\dummy.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\enhmeta.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\filedlg.cpp
 # End Source File
 # Begin Source File
@@ -1400,7 +1408,7 @@ SOURCE=.\jpeg\jcapimin.c
 !IF  "$(CFG)" == "wxvc_dll - Win32 Release"
 
 # ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include" /YX /Yc /Yu
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -1417,7 +1425,7 @@ SOURCE=.\jpeg\jcapistd.c
 !IF  "$(CFG)" == "wxvc_dll - Win32 Release"
 
 # ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include" /YX /Yc /Yu
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -1434,7 +1442,7 @@ SOURCE=.\jpeg\jccoefct.c
 !IF  "$(CFG)" == "wxvc_dll - Win32 Release"
 
 # ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include" /YX /Yc /Yu
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -1451,7 +1459,7 @@ SOURCE=.\jpeg\jccolor.c
 !IF  "$(CFG)" == "wxvc_dll - Win32 Release"
 
 # ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include" /YX /Yc /Yu
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -1468,7 +1476,7 @@ SOURCE=.\jpeg\jcdctmgr.c
 !IF  "$(CFG)" == "wxvc_dll - Win32 Release"
 
 # ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include" /YX /Yc /Yu
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -1485,7 +1493,7 @@ SOURCE=.\jpeg\jchuff.c
 !IF  "$(CFG)" == "wxvc_dll - Win32 Release"
 
 # ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include" /YX /Yc /Yu
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -1502,7 +1510,7 @@ SOURCE=.\jpeg\jcinit.c
 !IF  "$(CFG)" == "wxvc_dll - Win32 Release"
 
 # ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include" /YX /Yc /Yu
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -1519,7 +1527,7 @@ SOURCE=.\jpeg\jcmainct.c
 !IF  "$(CFG)" == "wxvc_dll - Win32 Release"
 
 # ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include" /YX /Yc /Yu
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -1536,7 +1544,7 @@ SOURCE=.\jpeg\jcmarker.c
 !IF  "$(CFG)" == "wxvc_dll - Win32 Release"
 
 # ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include" /YX /Yc /Yu
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -1553,7 +1561,7 @@ SOURCE=.\jpeg\jcmaster.c
 !IF  "$(CFG)" == "wxvc_dll - Win32 Release"
 
 # ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include" /YX /Yc /Yu
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -1570,7 +1578,7 @@ SOURCE=.\jpeg\jcomapi.c
 !IF  "$(CFG)" == "wxvc_dll - Win32 Release"
 
 # ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include" /YX /Yc /Yu
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -1587,7 +1595,7 @@ SOURCE=.\jpeg\jcparam.c
 !IF  "$(CFG)" == "wxvc_dll - Win32 Release"
 
 # ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include" /YX /Yc /Yu
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -1604,7 +1612,7 @@ SOURCE=.\jpeg\jcphuff.c
 !IF  "$(CFG)" == "wxvc_dll - Win32 Release"
 
 # ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include" /YX /Yc /Yu
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -1621,7 +1629,7 @@ SOURCE=.\jpeg\jcprepct.c
 !IF  "$(CFG)" == "wxvc_dll - Win32 Release"
 
 # ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include" /YX /Yc /Yu
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -1638,7 +1646,7 @@ SOURCE=.\jpeg\jcsample.c
 !IF  "$(CFG)" == "wxvc_dll - Win32 Release"
 
 # ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include" /YX /Yc /Yu
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -1655,7 +1663,7 @@ SOURCE=.\jpeg\jctrans.c
 !IF  "$(CFG)" == "wxvc_dll - Win32 Release"
 
 # ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include" /YX /Yc /Yu
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -1672,7 +1680,7 @@ SOURCE=.\jpeg\jdapimin.c
 !IF  "$(CFG)" == "wxvc_dll - Win32 Release"
 
 # ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include" /YX /Yc /Yu
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -1689,7 +1697,7 @@ SOURCE=.\jpeg\jdapistd.c
 !IF  "$(CFG)" == "wxvc_dll - Win32 Release"
 
 # ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include" /YX /Yc /Yu
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -1706,7 +1714,7 @@ SOURCE=.\jpeg\jdatadst.c
 !IF  "$(CFG)" == "wxvc_dll - Win32 Release"
 
 # ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include" /YX /Yc /Yu
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -1723,7 +1731,7 @@ SOURCE=.\jpeg\jdatasrc.c
 !IF  "$(CFG)" == "wxvc_dll - Win32 Release"
 
 # ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include" /YX /Yc /Yu
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -1740,7 +1748,7 @@ SOURCE=.\jpeg\jdcoefct.c
 !IF  "$(CFG)" == "wxvc_dll - Win32 Release"
 
 # ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include" /YX /Yc /Yu
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -1757,7 +1765,7 @@ SOURCE=.\jpeg\jdcolor.c
 !IF  "$(CFG)" == "wxvc_dll - Win32 Release"
 
 # ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include" /YX /Yc /Yu
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -1774,7 +1782,7 @@ SOURCE=.\jpeg\jddctmgr.c
 !IF  "$(CFG)" == "wxvc_dll - Win32 Release"
 
 # ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include" /YX /Yc /Yu
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -1791,7 +1799,7 @@ SOURCE=.\jpeg\jdhuff.c
 !IF  "$(CFG)" == "wxvc_dll - Win32 Release"
 
 # ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include" /YX /Yc /Yu
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -1808,7 +1816,7 @@ SOURCE=.\jpeg\jdinput.c
 !IF  "$(CFG)" == "wxvc_dll - Win32 Release"
 
 # ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include" /YX /Yc /Yu
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -1825,7 +1833,7 @@ SOURCE=.\jpeg\jdmainct.c
 !IF  "$(CFG)" == "wxvc_dll - Win32 Release"
 
 # ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include" /YX /Yc /Yu
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -1842,7 +1850,7 @@ SOURCE=.\jpeg\jdmarker.c
 !IF  "$(CFG)" == "wxvc_dll - Win32 Release"
 
 # ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include" /YX /Yc /Yu
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -1859,7 +1867,7 @@ SOURCE=.\jpeg\jdmaster.c
 !IF  "$(CFG)" == "wxvc_dll - Win32 Release"
 
 # ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include" /YX /Yc /Yu
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -1876,7 +1884,7 @@ SOURCE=.\jpeg\jdmerge.c
 !IF  "$(CFG)" == "wxvc_dll - Win32 Release"
 
 # ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include" /YX /Yc /Yu
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -1893,7 +1901,7 @@ SOURCE=.\jpeg\jdphuff.c
 !IF  "$(CFG)" == "wxvc_dll - Win32 Release"
 
 # ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include" /YX /Yc /Yu
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -1910,7 +1918,7 @@ SOURCE=.\jpeg\jdpostct.c
 !IF  "$(CFG)" == "wxvc_dll - Win32 Release"
 
 # ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include" /YX /Yc /Yu
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -1927,7 +1935,7 @@ SOURCE=.\jpeg\jdsample.c
 !IF  "$(CFG)" == "wxvc_dll - Win32 Release"
 
 # ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include" /YX /Yc /Yu
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -1944,7 +1952,7 @@ SOURCE=.\jpeg\jdtrans.c
 !IF  "$(CFG)" == "wxvc_dll - Win32 Release"
 
 # ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include" /YX /Yc /Yu
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -1961,7 +1969,7 @@ SOURCE=.\jpeg\jerror.c
 !IF  "$(CFG)" == "wxvc_dll - Win32 Release"
 
 # ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include" /YX /Yc /Yu
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -1978,7 +1986,7 @@ SOURCE=.\jpeg\jfdctflt.c
 !IF  "$(CFG)" == "wxvc_dll - Win32 Release"
 
 # ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include" /YX /Yc /Yu
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -1995,7 +2003,7 @@ SOURCE=.\jpeg\jfdctfst.c
 !IF  "$(CFG)" == "wxvc_dll - Win32 Release"
 
 # ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include" /YX /Yc /Yu
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -2012,7 +2020,7 @@ SOURCE=.\jpeg\jfdctint.c
 !IF  "$(CFG)" == "wxvc_dll - Win32 Release"
 
 # ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include" /YX /Yc /Yu
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -2029,7 +2037,7 @@ SOURCE=.\jpeg\jidctflt.c
 !IF  "$(CFG)" == "wxvc_dll - Win32 Release"
 
 # ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include" /YX /Yc /Yu
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -2046,7 +2054,7 @@ SOURCE=.\jpeg\jidctfst.c
 !IF  "$(CFG)" == "wxvc_dll - Win32 Release"
 
 # ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include" /YX /Yc /Yu
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -2063,7 +2071,7 @@ SOURCE=.\jpeg\jidctint.c
 !IF  "$(CFG)" == "wxvc_dll - Win32 Release"
 
 # ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include" /YX /Yc /Yu
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -2080,7 +2088,7 @@ SOURCE=.\jpeg\jidctred.c
 !IF  "$(CFG)" == "wxvc_dll - Win32 Release"
 
 # ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include" /YX /Yc /Yu
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -2097,7 +2105,7 @@ SOURCE=.\jpeg\jmemmgr.c
 !IF  "$(CFG)" == "wxvc_dll - Win32 Release"
 
 # ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include" /YX /Yc /Yu
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -2114,7 +2122,7 @@ SOURCE=.\jpeg\jmemnobs.c
 !IF  "$(CFG)" == "wxvc_dll - Win32 Release"
 
 # ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include" /YX /Yc /Yu
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -2131,7 +2139,7 @@ SOURCE=.\jpeg\jquant1.c
 !IF  "$(CFG)" == "wxvc_dll - Win32 Release"
 
 # ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include" /YX /Yc /Yu
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -2148,7 +2156,7 @@ SOURCE=.\jpeg\jquant2.c
 !IF  "$(CFG)" == "wxvc_dll - Win32 Release"
 
 # ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include" /YX /Yc /Yu
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -2165,7 +2173,7 @@ SOURCE=.\jpeg\jutils.c
 !IF  "$(CFG)" == "wxvc_dll - Win32 Release"
 
 # ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include"
+# SUBTRACT CPP /I "../include" /YX /Yc /Yu
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"