Applied colspan corrections, #15274 and #15275 (dghart)

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

diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms
index 00474ef5795cd056385bd5d6be9e1e8976f13b3f..0c61de6fd8d81cdfafc8595d3d14440039cd29db 100644 (file)
--- a/src/generic/descrip.mms
+++ b/src/generic/descrip.mms
@@ -1,8 +1,8 @@
 #*****************************************************************************
 #                                                                            *
 # Make file for VMS                                                          *
 #*****************************************************************************
 #                                                                            *
 # Make file for VMS                                                          *

-# Author : J.Jansen (joukj@hrem.stm.tudelft.nl)                              *
-# Date : 9 November 1999                                                     *
+# Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
+# Date : 21 January 2013                                                     *

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


@@ -18,10 +18,24 @@ 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
           /assume=(nostdnew,noglobal_array_new)
 CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm
 .else

+.ifdef __WXX11__
+CXX_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
+       /name=(as_is,short)/assume=(nostdnew,noglobal_array_new)
+CC_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
+       /name=(as_is,short)
+.else
+.ifdef __WXGTK2__
+CXX_DEFINE = /define=(__WXGTK__=1,VMS_GTK2==1)/float=ieee\
+       /name=(as_is,short)/assume=(nostdnew,noglobal_array_new)
+CC_DEFINE = /define=(__WX_GTK__=1,VMS_GTK2==1)/float=ieee\
+       /name=(as_is,short)
+.else

 CXX_DEFINE =
 CC_DEFINE =
 .endif
 .endif
 CXX_DEFINE =
 CC_DEFINE =
 .endif
 .endif

+.endif
+.endif

 
 .suffixes : .cpp
 
 
 .suffixes : .cpp
 


@@ -31,148 +45,269 @@ CC_DEFINE =
        cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
 
 OBJECTS = \
        cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
 
 OBJECTS = \

+               aboutdlgg.obj,\

                busyinfo.obj,\
                busyinfo.obj,\

-               calctrl.obj,\
+               calctrlg.obj,\

                caret.obj,\
                caret.obj,\

+               choicbkg.obj,\

                choicdgg.obj,\
                choicdgg.obj,\

-               colrdlgg.obj,\
+               datectlg.obj,\

                dcpsg.obj,\
                dirctrlg.obj,\
                dirdlgg.obj,\
                dcpsg.obj,\
                dirctrlg.obj,\
                dirdlgg.obj,\

+               fdrepdlg.obj,\

                fontdlgg.obj,\
                grid.obj,\
                gridctrl.obj,\
                gridsel.obj,\
                helpext.obj,\
                fontdlgg.obj,\
                grid.obj,\
                gridctrl.obj,\
                gridsel.obj,\
                helpext.obj,\

-               helphtml.obj,\
-               helpwxht.obj,\
+               htmllbox.obj,\

                imaglist.obj,\
                laywin.obj,\
                imaglist.obj,\
                laywin.obj,\

+               listbkg.obj,\

                listctrl.obj,\
                logg.obj,\
                msgdlgg.obj,\
                numdlgg.obj,\
                listctrl.obj,\
                logg.obj,\
                msgdlgg.obj,\
                numdlgg.obj,\

-               panelg.obj,\
+               odcombo.obj,\

                printps.obj,\
                prntdlgg.obj,\
                printps.obj,\
                prntdlgg.obj,\

+               propdlg.obj,\

                progdlgg.obj,\
                progdlgg.obj,\

-               prop.obj,\
-               propform.obj,\
-               proplist.obj,\
+               renderg.obj,\

                sashwin.obj,\
                sashwin.obj,\

+               scrlwing.obj,\
+               selstore.obj,\

                splitter.obj,\
                splitter.obj,\

-               statusbr.obj,\
-               tbarsmpl.obj,\

                tabg.obj,\
                textdlgg.obj,\
                tipdlg.obj,\
                tipwin.obj,\
                tabg.obj,\
                textdlgg.obj,\
                tipdlg.obj,\
                tipwin.obj,\

+               toolbkg.obj,\
+               treebkg.obj,\

                treectlg.obj,\
                treectlg.obj,\

-               wizard.obj
+               wizard.obj,\
+               hyperlinkg.obj,\
+               filepickerg.obj,\
+               bmpcboxg.obj,\
+               filectrlg.obj,srchctlg.obj,notifmsgg.obj,headerctrlg.obj,\
+               grideditors.obj,vlbox.obj,vscroll.obj,stattextg.obj,\
+               editlbox.obj,datavgen.obj,dbgrptg.obj,dragimgg.obj,\
+               richmsgdlgg.obj,commandlinkbuttong.obj,spinctlg.obj,\
+               markuptext.obj,bannerwindow.obj,timectrlg.obj,richtooltipg.obj\
+               ,statbmpg.obj,splash.obj

 
 SOURCES = \
 
 SOURCES = \

+               aboutdlgg.cpp,\

                accel.cpp,\
                accel.cpp,\

+               animateg.cpp,\

                busyinfo.cpp,\
                busyinfo.cpp,\

-               calctrl.cpp,\
+               calctrlg.cpp,\

                caret.cpp,\
                caret.cpp,\

+               choicbkg.cpp,\

                choicdgg.cpp,\
                choicdgg.cpp,\

+               collpaneg.cpp,\

                colrdlgg.cpp,\
                colrdlgg.cpp,\

+               clrpickerg.cpp,\
+               datectlg.cpp,\

                dcpsg.cpp,\
                dirctrlg.cpp,\
                dirdlgg.cpp,\
                filedlgg.cpp,\
                dcpsg.cpp,\
                dirctrlg.cpp,\
                dirdlgg.cpp,\
                filedlgg.cpp,\

+               fdrepdlg.cpp,\

                fontdlgg.cpp,\
                fontdlgg.cpp,\

+               fontpickerg.cpp,\

                grid.cpp,\
                gridctrl.cpp,\
                gridsel.cpp,\
                helpext.cpp,\
                grid.cpp,\
                gridctrl.cpp,\
                gridsel.cpp,\
                helpext.cpp,\

-               helphtml.cpp,\
-               helpwxht.cpp,\
+               htmllbox.cpp,\

                imaglist.cpp,\
                laywin.cpp,\
                imaglist.cpp,\
                laywin.cpp,\

+               listbkg.cpp,\

                listctrl.cpp,\
                logg.cpp,\
                msgdlgg.cpp,\
                notebook.cpp,\
                numdlgg.cpp,\
                listctrl.cpp,\
                logg.cpp,\
                msgdlgg.cpp,\
                notebook.cpp,\
                numdlgg.cpp,\

+               odcombo.cpp,\

                paletteg.cpp,\
                paletteg.cpp,\

-               panelg.cpp,\

                printps.cpp,\
                prntdlgg.cpp,\
                printps.cpp,\
                prntdlgg.cpp,\

+               propdlg.cpp,\

                progdlgg.cpp,\
                progdlgg.cpp,\

-               prop.cpp,\
-               propform.cpp,\
-               proplist.cpp,\
+               renderg.cpp,\

                sashwin.cpp,\
                sashwin.cpp,\

+               selstore.cpp,\

                splitter.cpp,\
                statline.cpp,\
                statusbr.cpp,\
                splitter.cpp,\
                statline.cpp,\
                statusbr.cpp,\

-               tbarsmpl.cpp,\

                tabg.cpp,\
                textdlgg.cpp,\
                tipdlg.cpp,\
                tipwin.cpp,\
                tabg.cpp,\
                textdlgg.cpp,\
                tipdlg.cpp,\
                tipwin.cpp,\

+               toolbkg.cpp,\
+               treebkg.cpp,\

                treectlg.cpp,\
                treectlg.cpp,\

-               wizard.cpp
+               wizard.cpp,\
+               dragimgg.cpp,\
+               fdrepdlg.cpp,\
+               htmllbox.cpp,\
+               listbkg.cpp,\
+               mdig.cpp,\
+               scrlwing.cpp,\
+               spinctlg.cpp,\
+               splash.cpp,\
+               timer.cpp,\
+               vlbox.cpp,\
+               hyperlinkg.cpp,\
+               filepickerg.cpp,\
+               vscroll.cpp,\
+               icon.cpp,bmpcboxg.cpp,filectrlg.cpp,srchctlg.cpp,notifmsgg.cpp\
+               ,headerctrlg.cpp,grideditors.cpp,stattextg.cpp,editlbox.cpp,\
+               datavgen.cpp,dbgrptg.cpp,dragimgg.cpp,richmsgdlgg.cpp,\
+               commandlinkbuttong.cpp,spinctlg.cpp markuptext.cpp \
+               bannerwindow.cpp timectrlg.cpp richtooltipg.cpp statbmpg.cpp \
+               textmeasure.cpp

 
 .ifdef __WXMOTIF__
 
 .ifdef __WXMOTIF__

-OBJECTS0=,statline.obj,notebook.obj,scrlwing.obj,spinctlg.obj
+OBJECTS0=statusbr.obj,statline.obj,notebook.obj,spinctlg.obj,collpaneg.obj,\
+       combog.obj,animateg.obj,colrdlgg.obj,clrpickerg.obj,fontpickerg.obj,\
+       mdig.obj,infobar.obj,textmeasure.obj
+.else
+.ifdef __WXX11__
+OBJECTS0=accel.obj,filedlgg.obj,dragimgg.obj,fdrepdlg.obj,htmllbox.obj,\
+       listbkg.obj,mdig.obj,spinctlg.obj,timer.obj,\
+       combog.obj,icon.obj,collpaneg.obj,animateg.obj,\
+       colrdlgg.obj,clrpickerg.obj,fontpickerg.obj,infobar.obj,textmeasure.obj

 .else
 .else

-OBJECTS0=,accel.obj,filedlgg.obj,paletteg.obj
+.ifdef __WXGTK__
+OBJECTS0=accel.obj,statusbr.obj,filedlgg.obj,paletteg.obj,\
+       combog.obj,icon.obj,collpaneg.obj,animateg.obj,\
+       colrdlgg.obj,clrpickerg.obj,fontpickerg.obj,infobar.obj,textmeasure.obj
+.else
+OBJECTS0=accel.obj,statusbr.obj,filedlgg.obj,paletteg.obj,\
+       combog.obj,icon.obj
+.endif
+.endif

 .endif
 
 all : $(SOURCES)
 .endif
 
 all : $(SOURCES)

-       $(MMS)$(MMSQUALIFIERS) $(OBJECTS)$(OBJECTS0)
+       $(MMS)$(MMSQUALIFIERS) $(OBJECTS)
+       $(MMS)$(MMSQUALIFIERS) $(OBJECTS0)

 .ifdef __WXMOTIF__
 .ifdef __WXMOTIF__

-       library/crea [--.lib]libwx_motif.olb $(OBJECTS)$(OBJECTS0)
+       library/crea [--.lib]libwx_motif.olb $(OBJECTS)
+       library [--.lib]libwx_motif.olb $(OBJECTS0)

 .else
 .ifdef __WXGTK__
 .else
 .ifdef __WXGTK__

-       library/crea [--.lib]libwx_gtk.olb $(OBJECTS)$(OBJECTS0)
+       library/crea [--.lib]libwx_gtk.olb $(OBJECTS)
+       library [--.lib]libwx_gtk.olb $(OBJECTS0)
+.else
+.ifdef __WXGTK2__
+       library/crea [--.lib]libwx_gtk2.olb $(OBJECTS)
+       library [--.lib]libwx_gtk2.olb $(OBJECTS0)
+.else
+.ifdef __WXX11__
+       library/crea [--.lib]libwx_x11_univ.olb $(OBJECTS)
+       library [--.lib]libwx_x11_univ.olb $(OBJECTS0)
+.endif
+.endif

 .endif
 .endif
 
 .endif
 .endif
 

+$(OBJECTS) : [--.include.wx]setup.h
+$(OBJECTS0) : [--.include.wx]setup.h
+
+aboutdlgg.obj : aboutdlgg.cpp

 accel.obj : accel.cpp
 accel.obj : accel.cpp

+animateg.obj : animateg.cpp

 busyinfo.obj : busyinfo.cpp
 busyinfo.obj : busyinfo.cpp

-calctrl.obj : calctrl.cpp
+calctrlg.obj : calctrlg.cpp

 caret.obj : caret.cpp
 choicdgg.obj : choicdgg.cpp
 caret.obj : caret.cpp
 choicdgg.obj : choicdgg.cpp

+clrpickerg.obj : clrpickerg.cpp
+collpaneg.obj : collpaneg.cpp

 colrdlgg.obj : colrdlgg.cpp
 colrdlgg.obj : colrdlgg.cpp

+datectlg.obj : datectlg.cpp

 dcpsg.obj : dcpsg.cpp
 dirctrlg.obj : dirctrlg.cpp
 dirdlgg.obj : dirdlgg.cpp
 filedlgg.obj : filedlgg.cpp
 fontdlgg.obj : fontdlgg.cpp
 dcpsg.obj : dcpsg.cpp
 dirctrlg.obj : dirctrlg.cpp
 dirdlgg.obj : dirdlgg.cpp
 filedlgg.obj : filedlgg.cpp
 fontdlgg.obj : fontdlgg.cpp

+fdrepdlg.obj : fdrepdlg.cpp

 grid.obj : grid.cpp
 gridctrl.obj : gridctrl.cpp
 gridsel.obj : gridsel.cpp
 helpext.obj : helpext.cpp
 grid.obj : grid.cpp
 gridctrl.obj : gridctrl.cpp
 gridsel.obj : gridsel.cpp
 helpext.obj : helpext.cpp

-helphtml.obj : helphtml.cpp
-helpwxht.obj : helpwxht.cpp
+htmllbox.obj : htmllbox.cpp
+icon.obj : icon.cpp

 imaglist.obj : imaglist.cpp
 laywin.obj : laywin.cpp
 listctrl.obj : listctrl.cpp
 imaglist.obj : imaglist.cpp
 laywin.obj : laywin.cpp
 listctrl.obj : listctrl.cpp

+       cxx $(CXXFLAGS)$(CXX_DEFINE)/warn=disable=(INTTRUNCATED) listctrl.cpp

 logg.obj : logg.cpp
 msgdlgg.obj : msgdlgg.cpp
 notebook.obj : notebook.cpp
 numdlgg.obj : numdlgg.cpp
 logg.obj : logg.cpp
 msgdlgg.obj : msgdlgg.cpp
 notebook.obj : notebook.cpp
 numdlgg.obj : numdlgg.cpp

+odcombo.obj : odcombo.cpp

 paletteg.obj : paletteg.cpp
 paletteg.obj : paletteg.cpp

-panelg.obj : panelg.cpp

 printps.obj : printps.cpp
 prntdlgg.obj : prntdlgg.cpp
 progdlgg.obj : progdlgg.cpp
 printps.obj : printps.cpp
 prntdlgg.obj : prntdlgg.cpp
 progdlgg.obj : progdlgg.cpp

-prop.obj : prop.cpp
-propform.obj : propform.cpp
-proplist.obj : proplist.cpp
+propdlg.obj : propdlg.cpp

 scrlwing.obj : scrlwing.cpp
 spinctlg.obj : spinctlg.cpp
 scrlwing.obj : scrlwing.cpp
 spinctlg.obj : spinctlg.cpp

+renderg.obj : renderg.cpp

 sashwin.obj : sashwin.cpp
 sashwin.obj : sashwin.cpp

+selstore.obj : selstore.cpp

 splitter.obj : splitter.cpp
 statline.obj : statline.cpp
 statusbr.obj : statusbr.cpp
 splitter.obj : splitter.cpp
 statline.obj : statline.cpp
 statusbr.obj : statusbr.cpp

-tbarsmpl.obj : tbarsmpl.cpp

 tabg.obj : tabg.cpp
 textdlgg.obj : textdlgg.cpp
 tipdlg.obj : tipdlg.cpp
 tipwin.obj : tipwin.cpp
 treectlg.obj : treectlg.cpp
 wizard.obj : wizard.cpp
 tabg.obj : tabg.cpp
 textdlgg.obj : textdlgg.cpp
 tipdlg.obj : tipdlg.cpp
 tipwin.obj : tipwin.cpp
 treectlg.obj : treectlg.cpp
 wizard.obj : wizard.cpp

+dragimgg.obj : dragimgg.cpp
+fdrepdlg.obj : fdrepdlg.cpp
+htmllbox.obj : htmllbox.cpp
+listbkg.obj : listbkg.cpp
+mdig.obj : mdig.cpp
+scrlwing.obj : scrlwing.cpp
+spinctlg.obj : spinctlg.cpp
+splash.obj : splash.cpp
+timer.obj : timer.cpp
+vlbox.obj : vlbox.cpp
+vscroll.obj : vscroll.cpp
+       cxx $(CXXFLAGS)$(CXX_DEFINE)/nowarn vscroll.cpp
+listbkg.obj : listbkg.cpp
+choicbkg.obj : choicbkg.cpp
+toolbkg.obj : toolbkg.cpp
+treebkg.obj : treebkg.cpp
+combog.obj : combog.cpp
+fontpickerg.obj : fontpickerg.cpp
+hyperlinkg.obj : hyperlinkg.cpp
+filepickerg.obj : filepickerg.cpp
+bmpcboxg.obj : bmpcboxg.cpp
+filectrlg.obj : filectrlg.cpp
+srchctlg.obj : srchctlg.cpp
+notifmsgg.obj : notifmsgg.cpp
+stattextg.obj : stattextg.cpp
+headerctrlg.obj : headerctrlg.cpp
+grideditors.obj : grideditors.cpp
+infobar.obj : infobar.cpp
+datavgen.obj : datavgen.cpp
+       cxx $(CXXFLAGS)$(CXX_DEFINE)/warn=disable=(UNSCOMZER) datavgen.cpp
+dbgrptg.obj : dbgrptg.cpp
+dragimgg.obj : dragimgg.cpp
+richmsgdlgg.obj : richmsgdlgg.cpp
+commandlinkbuttong.obj : commandlinkbuttong.cpp
+spinctlg.obj : spinctlg.cpp
+markuptext.obj : markuptext.cpp
+bannerwindow.obj : bannerwindow.cpp
+timectrlg.obj : timectrlg.cpp
+richtooltipg.obj : richtooltipg.cpp
+statbmpg.obj : statbmpg.cpp
+textmeasure.obj : textmeasure.cpp
+editlbox.obj : editlbox.cpp