merged MapBitmap() from 2.2 branch

[wxWidgets.git] / src / common / descrip.mms

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index 1f9a4bfdc03a8cdf7682a3fd9622da9a434d90b7..132ebfbc3839780046d0ae1749c8fd59bfd0385d 100644 (file)
--- a/src/common/descrip.mms
+++ b/src/common/descrip.mms
@@ -89,6 +89,7 @@ OBJECTS1=framecmn.obj,\
                imagpng.obj,\
                imagpnm.obj,\
                imagtiff.obj,\
                imagpng.obj,\
                imagpnm.obj,\
                imagtiff.obj,\

+               imagxpm.obj,\

                intl.obj,\
                ipcbase.obj,\
                layout.obj,\
                intl.obj,\
                ipcbase.obj,\
                layout.obj,\


@@ -101,6 +102,7 @@ OBJECTS1=framecmn.obj,\
                mimecmn.obj,\
                module.obj,\
                mstream.obj,\
                mimecmn.obj,\
                module.obj,\
                mstream.obj,\

+               nbkbase.obj,\

                object.obj,\
                objstrm.obj,\
                paper.obj,\
                object.obj,\
                objstrm.obj,\
                paper.obj,\


@@ -118,6 +120,7 @@ OBJECTS1=framecmn.obj,\
                strconv.obj,\
                stream.obj,\
                string.obj,\
                strconv.obj,\
                stream.obj,\
                string.obj,\

+               sysopt.obj,\

                tbarbase.obj,\
                textcmn.obj,\
                textfile.obj,\
                tbarbase.obj,\
                textcmn.obj,\
                textfile.obj,\


@@ -136,6 +139,7 @@ OBJECTS1=framecmn.obj,\
                wincmn.obj,\
                wxchar.obj,\
                wxexpr.obj,\
                wincmn.obj,\
                wxchar.obj,\
                wxexpr.obj,\

+               xpmdecod.obj,\

                zipstrm.obj,\
                zstream.obj
 
                zipstrm.obj,\
                zstream.obj
 


@@ -190,6 +194,7 @@ SOURCES = \
                imagpng.cpp,\
                imagpnm.cpp,\
                imagtiff.cpp,\
                imagpng.cpp,\
                imagpnm.cpp,\
                imagtiff.cpp,\

+               imagxpm.cpp,\

                intl.cpp,\
                ipcbase.cpp,\
                layout.cpp,\
                intl.cpp,\
                ipcbase.cpp,\
                layout.cpp,\


@@ -202,6 +207,7 @@ SOURCES = \
                mimecmn.cpp,\
                module.cpp,\
                mstream.cpp,\
                mimecmn.cpp,\
                module.cpp,\
                mstream.cpp,\

+               nbkbase.cpp,\

                object.cpp,\
                objstrm.cpp,\
                paper.cpp,\
                object.cpp,\
                objstrm.cpp,\
                paper.cpp,\


@@ -218,6 +224,7 @@ SOURCES = \
                socket.cpp,\
                strconv.cpp,\
                stream.cpp,\
                socket.cpp,\
                strconv.cpp,\
                stream.cpp,\

+               sysopt.cpp,\

                string.cpp,\
                tbarbase.cpp,\
                textcmn.cpp,\
                string.cpp,\
                tbarbase.cpp,\
                textcmn.cpp,\


@@ -237,6 +244,7 @@ SOURCES = \
                wincmn.cpp,\
                wxchar.cpp,\
                wxexpr.cpp,\
                wincmn.cpp,\
                wxchar.cpp,\
                wxexpr.cpp,\

+               xpmdecod.cpp,\

                zipstrm.cpp,\
                zstream.cpp
 
                zipstrm.cpp,\
                zstream.cpp
 


@@ -321,6 +329,7 @@ imagpcx.obj : imagpcx.cpp
 imagpng.obj : imagpng.cpp
 imagpnm.obj : imagpnm.cpp
 imagtiff.obj : imagtiff.cpp
 imagpng.obj : imagpng.cpp
 imagpnm.obj : imagpnm.cpp
 imagtiff.obj : imagtiff.cpp

+imagxpm.obj : imagxpm.cpp

 intl.obj : intl.cpp
 ipcbase.obj : ipcbase.cpp
 layout.obj : layout.cpp
 intl.obj : intl.cpp
 ipcbase.obj : ipcbase.cpp
 layout.obj : layout.cpp


@@ -333,6 +342,7 @@ menucmn.obj : menucmn.cpp
 mimecmn.obj : mimecmn.cpp
 module.obj : module.cpp
 mstream.obj : mstream.cpp
 mimecmn.obj : mimecmn.cpp
 module.obj : module.cpp
 mstream.obj : mstream.cpp

+nbkbase.obj : nbkbase.cpp

 object.obj : object.cpp
 objstrm.obj : objstrm.cpp
 paper.obj : paper.cpp
 object.obj : object.cpp
 objstrm.obj : objstrm.cpp
 paper.obj : paper.cpp


@@ -349,6 +359,7 @@ sizer.obj : sizer.cpp
 socket.obj : socket.cpp
 strconv.obj : strconv.cpp
 stream.obj : stream.cpp
 socket.obj : socket.cpp
 strconv.obj : strconv.cpp
 stream.obj : stream.cpp

+sysopt.obj : sysopt.cpp

 string.obj : string.cpp
 tbarbase.obj : tbarbase.cpp
 textcmn.obj : textcmn.cpp
 string.obj : string.cpp
 tbarbase.obj : tbarbase.cpp
 textcmn.obj : textcmn.cpp


@@ -368,5 +379,6 @@ wfstream.obj : wfstream.cpp
 wincmn.obj : wincmn.cpp
 wxchar.obj : wxchar.cpp
 wxexpr.obj : wxexpr.cpp
 wincmn.obj : wincmn.cpp
 wxchar.obj : wxchar.cpp
 wxexpr.obj : wxexpr.cpp

+xpmdecod.obj : xpmdecod.cpp

 zipstrm.obj : zipstrm.cpp
 zstream.obj : zstream.cpp
 zipstrm.obj : zipstrm.cpp
 zstream.obj : zstream.cpp