more GTK-ish toolbar drawing

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

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index d312a208108059354bbb8489c8e561315e05a32e..15b0a84c4ab1af8c70dddca7fdf91f6a618a1115 100644 (file)
--- a/src/common/descrip.mms
+++ b/src/common/descrip.mms
@@ -10,12 +10,17 @@
        set command $disk2:[joukj.com]bison.cld
 
 .ifdef __WXMOTIF__
        set command $disk2:[joukj.com]bison.cld
 
 .ifdef __WXMOTIF__

-CXX_DEFINE = /define=(__WXMOTIF__=1)
+CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\
+          /assume=(nostdnew,noglobal_array_new)
+CC_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)

 .else
 .ifdef __WXGTK__
 .else
 .ifdef __WXGTK__

-CXX_DEFINE = /define=(__WXGTK__=1)
+CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm\
+          /assume=(nostdnew,noglobal_array_new)
+CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm

 .else
 CXX_DEFINE =
 .else
 CXX_DEFINE =

+CC_DEFINE =

 .endif
 .endif
 
 .endif
 .endif
 


@@ -30,23 +35,29 @@ LEX=flex
 .cpp.obj :
        cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp
 .c.obj :
 .cpp.obj :
        cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp
 .c.obj :

-       cc $(CFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).c
+       cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c

 
 OBJECTS = \
                parser.obj,\
                appcmn.obj,\
                choiccmn.obj,\
                clipcmn.obj,\
 
 OBJECTS = \
                parser.obj,\
                appcmn.obj,\
                choiccmn.obj,\
                clipcmn.obj,\

+               clntdata.obj,\

                cmdline.obj,\
                cmdline.obj,\

+               cmdproc.obj,\

                cmndata.obj,\
                config.obj,\
                cmndata.obj,\
                config.obj,\

+               containr.obj,\
+               cshelp.obj,\

                ctrlcmn.obj,\
                ctrlsub.obj,\
                datetime.obj,\
                datstrm.obj,\
                db.obj,\
                ctrlcmn.obj,\
                ctrlsub.obj,\
                datetime.obj,\
                datstrm.obj,\
                db.obj,\

+               dbgrid.obj,\

                dbtable.obj,\
                dcbase.obj,\
                dbtable.obj,\
                dcbase.obj,\

+               dircmn.obj,\

                dlgcmn.obj,\
                dobjcmn.obj,\
                docmdi.obj,\
                dlgcmn.obj,\
                dobjcmn.obj,\
                docmdi.obj,\


@@ -59,29 +70,33 @@ OBJECTS = \
                ffile.obj,\
                file.obj,\
                fileconf.obj,\
                ffile.obj,\
                file.obj,\
                fileconf.obj,\

+               filename.obj,\

                filefn.obj,\
                filesys.obj,\
                fontcmn.obj,\
                filefn.obj,\
                filesys.obj,\
                fontcmn.obj,\

-               fontmap.obj
+               fontmap.obj,\
+               framecmn.obj

 
 

-OBJECTS1=framecmn.obj,\
-               fs_inet.obj,\
+OBJECTS1=fs_inet.obj,\

                fs_zip.obj,\
                ftp.obj,\
                gdicmn.obj,\
                gifdecod.obj,\
                hash.obj,\
                fs_zip.obj,\
                ftp.obj,\
                gdicmn.obj,\
                gifdecod.obj,\
                hash.obj,\

+               hashmap.obj,\

                helpbase.obj,\
                http.obj,\
                imagall.obj,\
                imagbmp.obj,\
                image.obj,\
                imaggif.obj,\
                helpbase.obj,\
                http.obj,\
                imagall.obj,\
                imagbmp.obj,\
                image.obj,\
                imaggif.obj,\

+               imagiff.obj,\

                imagjpeg.obj,\
                imagpcx.obj,\
                imagpng.obj,\
                imagpnm.obj,\
                imagtiff.obj,\
                imagjpeg.obj,\
                imagpcx.obj,\
                imagpng.obj,\
                imagpnm.obj,\
                imagtiff.obj,\

+               imagxpm.obj,\

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


@@ -94,28 +109,34 @@ OBJECTS1=framecmn.obj,\
                mimecmn.obj,\
                module.obj,\
                mstream.obj,\
                mimecmn.obj,\
                module.obj,\
                mstream.obj,\

+               nbkbase.obj,\

                object.obj,\
                object.obj,\

-               objstrm.obj,\

                paper.obj,\
                paper.obj,\

+               popupcmn.obj,\

                prntbase.obj,\
                process.obj,\
                protocol.obj,\
                prntbase.obj,\
                process.obj,\
                protocol.obj,\

+               quantize.obj,\

                resource.obj,\
                sckaddr.obj,\
                sckfile.obj,\
                sckipc.obj,\
                sckstrm.obj,\
                resource.obj,\
                sckaddr.obj,\
                sckfile.obj,\
                sckipc.obj,\
                sckstrm.obj,\

-               serbase.obj,\

                sizer.obj,\
                socket.obj,\
                sizer.obj,\
                socket.obj,\

+               statbar.obj,\

                strconv.obj,\
                stream.obj,\
                string.obj,\
                strconv.obj,\
                stream.obj,\
                string.obj,\

+               sysopt.obj,\

                tbarbase.obj,\
                tbarbase.obj,\

+               textbuf.obj,\

                textcmn.obj,\
                textfile.obj,\
                timercmn.obj,\
                tokenzr.obj,\
                textcmn.obj,\
                textfile.obj,\
                timercmn.obj,\
                tokenzr.obj,\

+               toplvcmn.obj,\
+               treebase.obj,\

                txtstrm.obj,\
                unzip.obj,\
                url.obj,\
                txtstrm.obj,\
                unzip.obj,\
                url.obj,\


@@ -127,7 +148,9 @@ OBJECTS1=framecmn.obj,\
                wfstream.obj,\
                wincmn.obj,\
                wxchar.obj,\
                wfstream.obj,\
                wincmn.obj,\
                wxchar.obj,\

-               wxexpr.obj,\
+               wxexpr.obj
+
+OBJECTS2=xpmdecod.obj,\

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


@@ -136,16 +159,22 @@ SOURCES = \
                appcmn.cpp,\
                choiccmn.cpp,\
                clipcmn.cpp,\
                appcmn.cpp,\
                choiccmn.cpp,\
                clipcmn.cpp,\

+               clntdata.cpp,\

                cmdline.cpp,\
                cmdline.cpp,\

+               cmdproc.cpp,\

                cmndata.cpp,\
                config.cpp,\
                cmndata.cpp,\
                config.cpp,\

+               containr.cpp,\
+               cshelp.cpp,\

                ctrlcmn.cpp,\
                ctrlsub.cpp,\
                datetime.cpp,\
                datstrm.cpp,\
                db.cpp,\
                ctrlcmn.cpp,\
                ctrlsub.cpp,\
                datetime.cpp,\
                datstrm.cpp,\
                db.cpp,\

+               dbgrid.cpp,\

                dbtable.cpp,\
                dcbase.cpp,\
                dbtable.cpp,\
                dcbase.cpp,\

+               dircmn.cpp,\

                dlgcmn.cpp,\
                dobjcmn.cpp,\
                docmdi.cpp,\
                dlgcmn.cpp,\
                dobjcmn.cpp,\
                docmdi.cpp,\


@@ -158,6 +187,7 @@ SOURCES = \
                ffile.cpp,\
                file.cpp,\
                fileconf.cpp,\
                ffile.cpp,\
                file.cpp,\
                fileconf.cpp,\

+               filename.cpp,\

                filefn.cpp,\
                filesys.cpp,\
                fontcmn.cpp,\
                filefn.cpp,\
                filesys.cpp,\
                fontcmn.cpp,\


@@ -169,17 +199,20 @@ SOURCES = \
                gdicmn.cpp,\
                gifdecod.cpp,\
                hash.cpp,\
                gdicmn.cpp,\
                gifdecod.cpp,\
                hash.cpp,\

+               hashmap.cpp,\

                helpbase.cpp,\
                http.cpp,\
                imagall.cpp,\
                imagbmp.cpp,\
                image.cpp,\
                imaggif.cpp,\
                helpbase.cpp,\
                http.cpp,\
                imagall.cpp,\
                imagbmp.cpp,\
                image.cpp,\
                imaggif.cpp,\

+               imagiff.cpp,\

                imagjpeg.cpp,\
                imagpcx.cpp,\
                imagpng.cpp,\
                imagpnm.cpp,\
                imagtiff.cpp,\
                imagjpeg.cpp,\
                imagpcx.cpp,\
                imagpng.cpp,\
                imagpnm.cpp,\
                imagtiff.cpp,\

+               imagxpm.cpp,\

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


@@ -192,28 +225,34 @@ SOURCES = \
                mimecmn.cpp,\
                module.cpp,\
                mstream.cpp,\
                mimecmn.cpp,\
                module.cpp,\
                mstream.cpp,\

+               nbkbase.cpp,\

                object.cpp,\
                object.cpp,\

-               objstrm.cpp,\

                paper.cpp,\
                paper.cpp,\

+               popupcmn.cpp,\

                prntbase.cpp,\
                process.cpp,\
                protocol.cpp,\
                prntbase.cpp,\
                process.cpp,\
                protocol.cpp,\

+               quantize.cpp,\

                resource.cpp,\
                sckaddr.cpp,\
                sckfile.cpp,\
                sckipc.cpp,\
                sckstrm.cpp,\
                resource.cpp,\
                sckaddr.cpp,\
                sckfile.cpp,\
                sckipc.cpp,\
                sckstrm.cpp,\

-               serbase.cpp,\

                sizer.cpp,\
                socket.cpp,\
                sizer.cpp,\
                socket.cpp,\

+               statbar.cpp,\

                strconv.cpp,\
                stream.cpp,\
                strconv.cpp,\
                stream.cpp,\

+               sysopt.cpp,\

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

+               textbuf.cpp,\

                textcmn.cpp,\
                textfile.cpp,\
                timercmn.cpp,\
                tokenzr.cpp,\
                textcmn.cpp,\
                textfile.cpp,\
                timercmn.cpp,\
                tokenzr.cpp,\

+               toplvcmn.cpp,\
+               treebase.cpp,\

                txtstrm.cpp,\
                unzip.c,\
                url.cpp,\
                txtstrm.cpp,\
                unzip.c,\
                url.cpp,\


@@ -226,19 +265,23 @@ SOURCES = \
                wincmn.cpp,\
                wxchar.cpp,\
                wxexpr.cpp,\
                wincmn.cpp,\
                wxchar.cpp,\
                wxexpr.cpp,\

+               xpmdecod.cpp,\

                zipstrm.cpp,\
                zstream.cpp
 
 all : $(SOURCES)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS1)
                zipstrm.cpp,\
                zstream.cpp
 
 all : $(SOURCES)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS1)

+       $(MMS)$(MMSQUALIFIERS) $(OBJECTS2)

 .ifdef __WXMOTIF__
        library [--.lib]libwx_motif.olb $(OBJECTS)
        library [--.lib]libwx_motif.olb $(OBJECTS1)
 .ifdef __WXMOTIF__
        library [--.lib]libwx_motif.olb $(OBJECTS)
        library [--.lib]libwx_motif.olb $(OBJECTS1)

+       library [--.lib]libwx_motif.olb $(OBJECTS2)

 .else
 .ifdef __WXGTK__
        library [--.lib]libwx_gtk.olb $(OBJECTS)
        library [--.lib]libwx_gtk.olb $(OBJECTS1)
 .else
 .ifdef __WXGTK__
        library [--.lib]libwx_gtk.olb $(OBJECTS)
        library [--.lib]libwx_gtk.olb $(OBJECTS1)

+       library [--.lib]libwx_gtk.olb $(OBJECTS2)

 .endif
 .endif
 
 .endif
 .endif
 


@@ -264,16 +307,22 @@ lexer.c : lexer.l
 appcmn.obj : appcmn.cpp
 choiccmn.obj : choiccmn.cpp
 clipcmn.obj : clipcmn.cpp
 appcmn.obj : appcmn.cpp
 choiccmn.obj : choiccmn.cpp
 clipcmn.obj : clipcmn.cpp

-cmndata.obj : cmndata.cpp
+clntdata.obj : clntdata.cpp

 cmdline.obj : cmdline.cpp
 cmdline.obj : cmdline.cpp

+cmdproc.obj : cmdproc.cpp
+cmndata.obj : cmndata.cpp

 config.obj : config.cpp
 config.obj : config.cpp

+containr.obj : containr.cpp
+cshelp.obj : cshelp.cpp

 ctrlcmn.obj : ctrlcmn.cpp
 ctrlsub.obj : ctrlsub.cpp
 datetime.obj : datetime.cpp
 datstrm.obj : datstrm.cpp
 db.obj : db.cpp
 ctrlcmn.obj : ctrlcmn.cpp
 ctrlsub.obj : ctrlsub.cpp
 datetime.obj : datetime.cpp
 datstrm.obj : datstrm.cpp
 db.obj : db.cpp

+dbgrid.obj : dbgrid.cpp

 dbtable.obj : dbtable.cpp
 dcbase.obj : dcbase.cpp
 dbtable.obj : dbtable.cpp
 dcbase.obj : dcbase.cpp

+dircmn.obj : dircmn.cpp

 dlgcmn.obj : dlgcmn.cpp
 dobjcmn.obj : dobjcmn.cpp
 docmdi.obj : docmdi.cpp
 dlgcmn.obj : dlgcmn.cpp
 dobjcmn.obj : dobjcmn.cpp
 docmdi.obj : docmdi.cpp


@@ -287,6 +336,7 @@ ffile.obj : ffile.cpp
 file.obj : file.cpp
 fileconf.obj : fileconf.cpp
 filefn.obj : filefn.cpp
 file.obj : file.cpp
 fileconf.obj : fileconf.cpp
 filefn.obj : filefn.cpp

+filename.obj : filename.cpp

 filesys.obj : filesys.cpp
 fontcmn.obj : fontcmn.cpp
 fontmap.obj : fontmap.cpp
 filesys.obj : filesys.cpp
 fontcmn.obj : fontcmn.cpp
 fontmap.obj : fontmap.cpp


@@ -297,17 +347,20 @@ ftp.obj : ftp.cpp
 gdicmn.obj : gdicmn.cpp
 gifdecod.obj : gifdecod.cpp
 hash.obj : hash.cpp
 gdicmn.obj : gdicmn.cpp
 gifdecod.obj : gifdecod.cpp
 hash.obj : hash.cpp

+hashmap.obj : hashmap.cpp

 helpbase.obj : helpbase.cpp
 http.obj : http.cpp
 imagall.obj : imagall.cpp
 imagbmp.obj : imagbmp.cpp
 image.obj : image.cpp
 imaggif.obj : imaggif.cpp
 helpbase.obj : helpbase.cpp
 http.obj : http.cpp
 imagall.obj : imagall.cpp
 imagbmp.obj : imagbmp.cpp
 image.obj : image.cpp
 imaggif.obj : imaggif.cpp

+imagiff.obj : imagiff.cpp

 imagjpeg.obj : imagjpeg.cpp
 imagpcx.obj : imagpcx.cpp
 imagpng.obj : imagpng.cpp
 imagpnm.obj : imagpnm.cpp
 imagtiff.obj : imagtiff.cpp
 imagjpeg.obj : imagjpeg.cpp
 imagpcx.obj : imagpcx.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


@@ -320,28 +373,34 @@ 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
 object.obj : object.cpp

-objstrm.obj : objstrm.cpp

 paper.obj : paper.cpp
 paper.obj : paper.cpp

+popupcmn.obj : popupcmn.cpp

 prntbase.obj : prntbase.cpp
 process.obj : process.cpp
 protocol.obj : protocol.cpp
 prntbase.obj : prntbase.cpp
 process.obj : process.cpp
 protocol.obj : protocol.cpp

+quantize.obj : quantize.cpp

 resource.obj : resource.cpp
 sckaddr.obj : sckaddr.cpp
 sckfile.obj : sckfile.cpp
 sckipc.obj : sckipc.cpp
 sckstrm.obj : sckstrm.cpp
 resource.obj : resource.cpp
 sckaddr.obj : sckaddr.cpp
 sckfile.obj : sckfile.cpp
 sckipc.obj : sckipc.cpp
 sckstrm.obj : sckstrm.cpp

-serbase.obj : serbase.cpp

 sizer.obj : sizer.cpp
 socket.obj : socket.cpp
 sizer.obj : sizer.cpp
 socket.obj : socket.cpp

+statbar.obj : statbar.cpp

 strconv.obj : strconv.cpp
 stream.obj : stream.cpp
 strconv.obj : strconv.cpp
 stream.obj : stream.cpp

+sysopt.obj : sysopt.cpp

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

+textbuf.obj : textbuf.cpp

 textcmn.obj : textcmn.cpp
 textfile.obj : textfile.cpp
 timercmn.obj : timercmn.cpp
 tokenzr.obj : tokenzr.cpp
 textcmn.obj : textcmn.cpp
 textfile.obj : textfile.cpp
 timercmn.obj : timercmn.cpp
 tokenzr.obj : tokenzr.cpp

+toplvcmn.obj : toplvcmn.cpp
+treebase.obj : treebase.cpp

 txtstrm.obj : txtstrm.cpp
 unzip.obj : unzip.c
 url.obj : url.cpp
 txtstrm.obj : txtstrm.cpp
 unzip.obj : unzip.c
 url.obj : url.cpp


@@ -354,5 +413,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