fixing iterator comparison

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

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index c8728c5ec8d48c52b92b198bad2b0426c1c3a3d4..5b6fc3241fa16b2dac6c86746684425cba90c1e2 100644 (file)
--- a/src/common/descrip.mms
+++ b/src/common/descrip.mms
@@ -2,7 +2,7 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *

-# Date : 12 September 2007                                                   *
+# Date : 15 December 2010                                                    *

 #                                                                            *
 #*****************************************************************************
 .first
 #                                                                            *
 #*****************************************************************************
 .first


@@ -10,24 +10,26 @@
 
 .ifdef __WXMOTIF__
 CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\
 
 .ifdef __WXMOTIF__
 CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\

-          /assume=(nostdnew,noglobal_array_new)
-CC_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)
+          /assume=(nostdnew,noglobal_array_new)/incl=[-.regex]
+CC_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)/incl=[-.regex]

 .else
 .ifdef __WXGTK__
 CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm\
 .else
 .ifdef __WXGTK__
 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
+          /assume=(nostdnew,noglobal_array_new)/incl=[-.regex]
+CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm\
+       /incl=[-.regex]

 .else
 .ifdef __WXGTK2__
 CXX_DEFINE = /define=(__WXGTK__=1,VMS_GTK2=1)/float=ieee/name=(as_is,short)/ieee=denorm\
 .else
 .ifdef __WXGTK2__
 CXX_DEFINE = /define=(__WXGTK__=1,VMS_GTK2=1)/float=ieee/name=(as_is,short)/ieee=denorm\

-          /assume=(nostdnew,noglobal_array_new)
-CC_DEFINE = /define=(__WXGTK__=1,VMS_GTK2=1)/float=ieee/name=(as_is,short)/ieee=denorm
+          /assume=(nostdnew,noglobal_array_new)/incl=[-.regex]
+CC_DEFINE = /define=(__WXGTK__=1,VMS_GTK2=1)/float=ieee/name=(as_is,short)\
+       /ieee=denorm/incl=[-.regex]

 .else
 .ifdef __WXX11__
 CXX_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
 .else
 .ifdef __WXX11__
 CXX_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\

-       /name=(as_is,short)/assume=(nostdnew,noglobal_array_new)
+       /name=(as_is,short)/assume=(nostdnew,noglobal_array_new)/incl=[-.regex]

 CC_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
 CC_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\

-       /name=(as_is,short)
+       /name=(as_is,short)/incl=[-.regex]

 .else
 CXX_DEFINE =
 CC_DEFINE =
 .else
 CXX_DEFINE =
 CC_DEFINE =


@@ -61,7 +63,9 @@ OBJECTS = \
                base64.obj,\
                bmpbase.obj,\
                btncmn.obj,\
                base64.obj,\
                bmpbase.obj,\
                btncmn.obj,\

+               bmpcboxcmn.obj,\

                bookctrl.obj,\
                bookctrl.obj,\

+               calctrlcmn.obj,\

                choiccmn.obj,\
                clipcmn.obj,\
                clntdata.obj,\
                choiccmn.obj,\
                clipcmn.obj,\
                clntdata.obj,\


@@ -78,9 +82,6 @@ OBJECTS = \
                datacmn.obj,\
                datetime.obj,\
                datstrm.obj,\
                datacmn.obj,\
                datetime.obj,\
                datstrm.obj,\

-               db.obj,\
-               dbgrid.obj,\
-               dbtable.obj,\

                dcbase.obj,\
                dcbufcmn.obj,\
                dircmn.obj,\
                dcbase.obj,\
                dcbufcmn.obj,\
                dircmn.obj,\


@@ -103,6 +104,7 @@ OBJECTS = \
                filename.obj,\
                filefn.obj,\
                filesys.obj,\
                filename.obj,\
                filefn.obj,\
                filesys.obj,\

+               filectrlcmn.obj,\

                fldlgcmn.obj,\
                fmapbase.obj,\
                fontcmn.obj,\
                fldlgcmn.obj,\
                fmapbase.obj,\
                fontcmn.obj,\


@@ -183,6 +185,7 @@ OBJECTS2=tbarbase.obj,srchcmn.obj,\
                textbuf.obj,\
                textcmn.obj,\
                textfile.obj,\
                textbuf.obj,\
                textcmn.obj,\
                textfile.obj,\

+               textentrycmn.obj,\

                timercmn.obj,\
                timerimpl.obj,\
                tokenzr.obj,\
                timercmn.obj,\
                timerimpl.obj,\
                tokenzr.obj,\


@@ -208,25 +211,31 @@ OBJECTS2=tbarbase.obj,srchcmn.obj,\
                filepickercmn.obj,\
                fontpickercmn.obj,\
                pickerbase.obj,\
                filepickercmn.obj,\
                fontpickercmn.obj,\
                pickerbase.obj,\

-               listctrlcmn.obj
+               listctrlcmn.obj,socketiohandler.obj,fdiodispatcher.obj,\
+               selectdispatcher.obj,overlaycmn.obj,windowid.obj,sstream.obj,\
+               wrapsizer.obj,headerctrlcmn.obj,headercolcmn.obj,\
+               rearrangectrl.obj,spinctrlcmn.obj,datetimefmt.obj,xlocale.obj,\
+               regex.obj,any.obj,archive.obj,fs_arc.obj,arcall.obj,\
+               arcfind.obj,tarstrm.obj,datavcmn.obj,debugrpt.obj,\
+               translation.obj,languageinfo.obj,filehistorycmn.obj,\
+               stdstream.obj,uiactioncmn.obj

 
 OBJECTS_MOTIF=radiocmn.obj,combocmn.obj
 
 OBJECTS_X11=accesscmn.obj,dndcmn.obj,dpycmn.obj,dseldlg.obj,\
        dynload.obj,effects.obj,fddlgcmn.obj,fs_mem.obj,\
        gbsizer.obj,geometry.obj,matrix.obj,radiocmn.obj,\
 
 OBJECTS_MOTIF=radiocmn.obj,combocmn.obj
 
 OBJECTS_X11=accesscmn.obj,dndcmn.obj,dpycmn.obj,dseldlg.obj,\
        dynload.obj,effects.obj,fddlgcmn.obj,fs_mem.obj,\
        gbsizer.obj,geometry.obj,matrix.obj,radiocmn.obj,\

-       regex.obj,taskbarcmn.obj,xti.obj,xtistrm.obj,xtixml.obj,\
+       taskbarcmn.obj,xti.obj,xtistrm.obj,xtixml.obj,\

        combocmn.obj
 
        combocmn.obj
 

-OBJECTS_X11_2=gsocketiohandler.obj,fdiodispatcher.obj,selectdispatcher.obj

 
 

-
-OBJECTS_GTK2=fontutilcmn.obj
+OBJECTS_GTK2=fontutilcmn.obj,cairo.obj

 
 SOURCES = \
                accelcmn.cpp,\
                anidecod.cpp,\
                animatecmn.cpp,\
 
 SOURCES = \
                accelcmn.cpp,\
                anidecod.cpp,\
                animatecmn.cpp,\

+               any.cpp,\

                appbase.cpp,\
                appcmn.cpp,\
                arrstr.cpp,\
                appbase.cpp,\
                appcmn.cpp,\
                arrstr.cpp,\


@@ -235,7 +244,10 @@ SOURCES = \
                base64.cpp,\
                bmpbase.cpp,\
                btncmn.cpp,\
                base64.cpp,\
                bmpbase.cpp,\
                btncmn.cpp,\

+               bmpcboxcmn.cpp,\

                bookctrl.cpp,\
                bookctrl.cpp,\

+               calctrlcmn.cpp,\
+               cairo.cpp,\

                choiccmn.cpp,\
                clipcmn.cpp,\
                clntdata.cpp,\
                choiccmn.cpp,\
                clipcmn.cpp,\
                clntdata.cpp,\


@@ -252,9 +264,6 @@ SOURCES = \
                datacmn.cpp,\
                datetime.cpp,\
                datstrm.cpp,\
                datacmn.cpp,\
                datetime.cpp,\
                datstrm.cpp,\

-               db.cpp,\
-               dbgrid.cpp,\
-               dbtable.cpp,\

                dcbase.cpp,\
                dcbufcmn.cpp,\
                dircmn.cpp,\
                dcbase.cpp,\
                dcbufcmn.cpp,\
                dircmn.cpp,\


@@ -278,6 +287,7 @@ SOURCES = \
                filename.cpp,\
                filefn.cpp,\
                filesys.cpp,\
                filename.cpp,\
                filefn.cpp,\
                filesys.cpp,\

+               filectrlcmn.cpp,\

                fldlgcmn.cpp,\
                fmapbase.cpp,\
                fontcmn.cpp,\
                fldlgcmn.cpp,\
                fmapbase.cpp,\
                fontcmn.cpp,\


@@ -291,7 +301,7 @@ SOURCES = \
                gbsizer.cpp,\
                gdicmn.cpp,\
                gifdecod.cpp,\
                gbsizer.cpp,\
                gdicmn.cpp,\
                gifdecod.cpp,\

-               gsocketiohandler.cpp,\
+               socketiohandler.cpp,\

                hash.cpp,\
                hashmap.cpp,\
                helpbase.cpp,\
                hash.cpp,\
                hashmap.cpp,\
                helpbase.cpp,\


@@ -328,6 +338,7 @@ SOURCES = \
                mstream.cpp,\
                nbkbase.cpp,\
                object.cpp,\
                mstream.cpp,\
                nbkbase.cpp,\
                object.cpp,\

+               overlaycmn.cpp,\

                paper.cpp,\
                platinfo.cpp,\
                popupcmn.cpp,\
                paper.cpp,\
                platinfo.cpp,\
                popupcmn.cpp,\


@@ -346,6 +357,7 @@ SOURCES = \
                socket.cpp,\
                selectdispatcher.cpp,\
                settcmn.cpp,\
                socket.cpp,\
                selectdispatcher.cpp,\
                settcmn.cpp,\

+               sstream.cpp,\

                statbar.cpp,\
                stattextcmn.cpp,\
                stdpbase.cpp,\
                statbar.cpp,\
                stattextcmn.cpp,\
                stdpbase.cpp,\


@@ -362,6 +374,7 @@ SOURCES = \
                textbuf.cpp,\
                textcmn.cpp,\
                textfile.cpp,\
                textbuf.cpp,\
                textcmn.cpp,\
                textfile.cpp,\

+               textentrycmn.cpp,\

                timercmn.cpp,\
                timerimpl.cpp,\
                tokenzr.cpp,\
                timercmn.cpp,\
                timerimpl.cpp,\
                tokenzr.cpp,\


@@ -402,7 +415,9 @@ SOURCES = \
                uri.cpp,\
                xti.cpp,\
                xtistrm.cpp,\
                uri.cpp,\
                xti.cpp,\
                xtistrm.cpp,\

-               xtixml.cpp
+               xtixml.cpp,\
+               wrapsizer.cpp,archive.cpp,fs_arc.cpp,arcall.cpp,arcfind.cpp,\
+               tarstrm.cpp,datavcmn.cpp,debugrpt.cpp,uiactioncmn.cpp

 
 all : $(SOURCES)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS)
 
 all : $(SOURCES)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS)


@@ -433,20 +448,26 @@ all : $(SOURCES)
 .else
 .ifdef __WXX11__
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS_X11)
 .else
 .ifdef __WXX11__
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS_X11)

-       $(MMS)$(MMSQUALIFIERS) $(OBJECTS_X11_2)

        library [--.lib]libwx_x11_univ.olb $(OBJECTS)
        library [--.lib]libwx_x11_univ.olb $(OBJECTS1)
        library [--.lib]libwx_x11_univ.olb $(OBJECTS2)
        library [--.lib]libwx_x11_univ.olb $(OBJECTS_X11)
        library [--.lib]libwx_x11_univ.olb $(OBJECTS)
        library [--.lib]libwx_x11_univ.olb $(OBJECTS1)
        library [--.lib]libwx_x11_univ.olb $(OBJECTS2)
        library [--.lib]libwx_x11_univ.olb $(OBJECTS_X11)

-       library [--.lib]libwx_x11_univ.olb $(OBJECTS_X11_2)

 .endif
 .endif
 .endif
 .endif
 
 .endif
 .endif
 .endif
 .endif
 

+$(OBJECTS) : [--.include.wx]setup.h
+$(OBJECTS1) : [--.include.wx]setup.h
+$(OBJECTS2) : [--.include.wx]setup.h
+$(OBJECTS_X11) : [--.include.wx]setup.h
+$(OBJECTS_GTK2) : [--.include.wx]setup.h
+$(OBJECTS_MOTIF) : [--.include.wx]setup.h
+

 accelcmn.obj : accelcmn.cpp
 anidecod.obj : anidecod.cpp
 animatecmn.obj : animatecmn.cpp
 accelcmn.obj : accelcmn.cpp
 anidecod.obj : anidecod.cpp
 animatecmn.obj : animatecmn.cpp

+any.obj : any.cpp

 appbase.obj : appbase.cpp
 appcmn.obj : appcmn.cpp
 arrstr.obj : arrstr.cpp
 appbase.obj : appbase.cpp
 appcmn.obj : appcmn.cpp
 arrstr.obj : arrstr.cpp


@@ -455,6 +476,7 @@ artstd.obj : artstd.cpp
 base64.obj : base64.cpp
 bmpbase.obj : bmpbase.cpp
 btncmn.obj : btncmn.cpp
 base64.obj : base64.cpp
 bmpbase.obj : bmpbase.cpp
 btncmn.obj : btncmn.cpp

+bmpcboxcmn.obj : bmpcboxcmn.cpp

 bookctrl.obj : bookctrl.cpp
 choiccmn.obj : choiccmn.cpp
 clipcmn.obj : clipcmn.cpp
 bookctrl.obj : bookctrl.cpp
 choiccmn.obj : choiccmn.cpp
 clipcmn.obj : clipcmn.cpp


@@ -472,9 +494,6 @@ ctrlsub.obj : ctrlsub.cpp
 datacmn.obj : datacmn.cpp
 datetime.obj : datetime.cpp
 datstrm.obj : datstrm.cpp
 datacmn.obj : datacmn.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
 dcbufcmn.obj : dcbufcmn.cpp
 dircmn.obj : dircmn.cpp
 dcbase.obj : dcbase.cpp
 dcbufcmn.obj : dcbufcmn.cpp
 dircmn.obj : dircmn.cpp


@@ -510,11 +529,13 @@ gaugecmn.obj : gaugecmn.cpp
 gbsizer.obj : gbsizer.cpp
 gdicmn.obj : gdicmn.cpp
 gifdecod.obj : gifdecod.cpp
 gbsizer.obj : gbsizer.cpp
 gdicmn.obj : gdicmn.cpp
 gifdecod.obj : gifdecod.cpp

-gsocketiohandler.obj : gsocketiohandler.cpp
+socketiohandler.obj : socketiohandler.cpp

 hash.obj : hash.cpp
 hashmap.obj : hashmap.cpp
 helpbase.obj : helpbase.cpp
 http.obj : http.cpp
 hash.obj : hash.cpp
 hashmap.obj : hashmap.cpp
 helpbase.obj : helpbase.cpp
 http.obj : http.cpp

+       cxx$(CXXFLAGS)$(CXX_DEFINE)/warn=disable=(UNSCOMZER)/obj=http.obj \
+       http.cpp

 hyperlnkcmn.obj : hyperlnkcmn.cpp
 iconbndl.obj : iconbndl.cpp
 init.obj : init.cpp
 hyperlnkcmn.obj : hyperlnkcmn.cpp
 iconbndl.obj : iconbndl.cpp
 init.obj : init.cpp


@@ -624,3 +645,30 @@ fontpickercmn.obj : fontpickercmn.cpp
 pickerbase.obj : pickerbase.cpp
 listctrlcmn.obj : listctrlcmn.cpp
 srchcmn.obj : srchcmn.cpp
 pickerbase.obj : pickerbase.cpp
 listctrlcmn.obj : listctrlcmn.cpp
 srchcmn.obj : srchcmn.cpp

+textentrycmn.obj : textentrycmn.cpp
+filectrlcmn.obj : filectrlcmn.cpp
+cairo.obj : cairo.cpp
+       cxx$(CXXFLAGS)$(CXX_DEFINE)/obj=cairo.obj cairo.cpp
+overlaycmn.obj : overlaycmn.cpp
+windowid.obj : windowid.cpp
+calctrlcmn.obj : calctrlcmn.cpp
+sstream.obj : sstream.cpp
+wrapsizer.obj : wrapsizer.cpp
+headerctrlcmn.obj : headerctrlcmn.cpp
+headercolcmn.obj : headercolcmn.cpp
+rearrangectrl.obj : rearrangectrl.cpp
+spinctrlcmn.obj : spinctrlcmn.cpp
+datetimefmt.obj : datetimefmt.cpp
+xlocale.obj : xlocale.cpp
+archive.obj : archive.cpp
+fs_arc.obj : fs_arc.cpp
+arcall.obj : arcall.cpp
+arcfind.obj : arcfind.cpp
+tarstrm.obj : tarstrm.cpp
+datavcmn.obj : datavcmn.cpp
+debugrpt.obj : debugrpt.cpp
+translation.obj : translation.cpp
+languageinfo.obj : languageinfo.cpp
+filehistorycmn.obj : filehistorycmn.cpp
+stdstream.obj : stdstream.cpp
+uiactioncmn.obj : uiactioncmn.cpp