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 3e58fb56ff8a94b8266f1ef363b61c594b1f3d37..0c61de6fd8d81cdfafc8595d3d14440039cd29db 100644 (file)
--- a/src/generic/descrip.mms
+++ b/src/generic/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 : 2 November 2010                                                     *
+# Date : 21 January 2013                                                     *

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


@@ -70,7 +70,6 @@ OBJECTS = \
                msgdlgg.obj,\
                numdlgg.obj,\
                odcombo.obj,\
                msgdlgg.obj,\
                numdlgg.obj,\
                odcombo.obj,\

-               panelg.obj,\

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


@@ -94,7 +93,9 @@ OBJECTS = \
                filectrlg.obj,srchctlg.obj,notifmsgg.obj,headerctrlg.obj,\
                grideditors.obj,vlbox.obj,vscroll.obj,stattextg.obj,\
                editlbox.obj,datavgen.obj,dbgrptg.obj,dragimgg.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
+               richmsgdlgg.obj,commandlinkbuttong.obj,spinctlg.obj,\
+               markuptext.obj,bannerwindow.obj,timectrlg.obj,richtooltipg.obj\
+               ,statbmpg.obj,splash.obj

 
 SOURCES = \
                aboutdlgg.cpp,\
 
 SOURCES = \
                aboutdlgg.cpp,\


@@ -131,7 +132,6 @@ SOURCES = \
                numdlgg.cpp,\
                odcombo.cpp,\
                paletteg.cpp,\
                numdlgg.cpp,\
                odcombo.cpp,\
                paletteg.cpp,\

-               panelg.cpp,\

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


@@ -166,23 +166,25 @@ SOURCES = \
                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,\
                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
+               commandlinkbuttong.cpp,spinctlg.cpp markuptext.cpp \
+               bannerwindow.cpp timectrlg.cpp richtooltipg.cpp statbmpg.cpp \
+               textmeasure.cpp

 
 .ifdef __WXMOTIF__
 OBJECTS0=statusbr.obj,statline.obj,notebook.obj,spinctlg.obj,collpaneg.obj,\
        combog.obj,animateg.obj,colrdlgg.obj,clrpickerg.obj,fontpickerg.obj,\
 
 .ifdef __WXMOTIF__
 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
+       mdig.obj,infobar.obj,textmeasure.obj

 .else
 .ifdef __WXX11__
 OBJECTS0=accel.obj,filedlgg.obj,dragimgg.obj,fdrepdlg.obj,htmllbox.obj,\
 .else
 .ifdef __WXX11__
 OBJECTS0=accel.obj,filedlgg.obj,dragimgg.obj,fdrepdlg.obj,htmllbox.obj,\

-       listbkg.obj,mdig.obj,spinctlg.obj,splash.obj,timer.obj,\
+       listbkg.obj,mdig.obj,spinctlg.obj,timer.obj,\

        combog.obj,icon.obj,collpaneg.obj,animateg.obj,\
        combog.obj,icon.obj,collpaneg.obj,animateg.obj,\

-       colrdlgg.obj,clrpickerg.obj,fontpickerg.obj,infobar.obj
+       colrdlgg.obj,clrpickerg.obj,fontpickerg.obj,infobar.obj,textmeasure.obj

 .else
 .ifdef __WXGTK__
 OBJECTS0=accel.obj,statusbr.obj,filedlgg.obj,paletteg.obj,\
        combog.obj,icon.obj,collpaneg.obj,animateg.obj,\
 .else
 .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
+       colrdlgg.obj,clrpickerg.obj,fontpickerg.obj,infobar.obj,textmeasure.obj

 .else
 OBJECTS0=accel.obj,statusbr.obj,filedlgg.obj,paletteg.obj,\
        combog.obj,icon.obj
 .else
 OBJECTS0=accel.obj,statusbr.obj,filedlgg.obj,paletteg.obj,\
        combog.obj,icon.obj


@@ -242,13 +244,13 @@ 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
 odcombo.obj : odcombo.cpp
 paletteg.obj : paletteg.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

-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


@@ -296,7 +298,16 @@ headerctrlg.obj : headerctrlg.cpp
 grideditors.obj : grideditors.cpp
 infobar.obj : infobar.cpp
 datavgen.obj : datavgen.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
 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