simplify code so it always returns the same object

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

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index 2b2e2306187cdc103743e0f67b0d46a786280f4d..079e0977d31847ab50276064f225c46fe3ae5154 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)                             *
-# Date : 7 January 2011                                                      *
+# Date : 6 November 2012                                                     *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -209,8 +209,9 @@ OBJECTS2=tbarbase.obj,srchcmn.obj,\
                clrpickercmn.obj,\
                filepickercmn.obj,\
                fontpickercmn.obj,\
-               pickerbase.obj,\
-               listctrlcmn.obj,socketiohandler.obj,fdiodispatcher.obj,\
+               pickerbase.obj
+
+OBJECTS3=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,\
@@ -221,7 +222,10 @@ OBJECTS2=tbarbase.obj,srchcmn.obj,\
                panelcmn.obj,checkboxcmn.obj,statboxcmn.obj,slidercmn.obj,\
                statlinecmn.obj,radiobtncmn.obj,bmpbtncmn.obj,checklstcmn.obj,\
                statbmpcmn.obj,dirctrlcmn.obj,gridcmn.obj,odcombocmn.obj,\
-               spinbtncmn.obj,scrolbarcmn.obj
+               spinbtncmn.obj,scrolbarcmn.obj,colourdata.obj,fontdata.obj,\
+               valnum.obj,numformatter.obj,markupparser.obj,\
+               affinematrix2d.obj,richtooltipcmn.obj,persist.obj,time.obj,\
+               textmeasurecmn.obj
 
 OBJECTS_MOTIF=radiocmn.obj,combocmn.obj
 
@@ -423,17 +427,21 @@ SOURCES = \
                arttango.cpp,mediactrlcmn.cpp,panelcmn.cpp,checkboxcmn.cpp,\
                statboxcmn.cpp,slidercmn.cpp,statlinecmn.cpp,radiobtncmn.cpp,\
                bmpbtncmn.cpp,checklstcmn.cpp,statbmpcmn.cpp,dirctrlcmn.cpp,\
-               gridcmn.cpp,odcombocmn.cpp,spinbtncmn.cpp,scrolbarcmn.cpp
+               gridcmn.cpp,odcombocmn.cpp,spinbtncmn.cpp,scrolbarcmn.cpp,\
+               colourdata.cpp,fontdata.cpp affinematrix2d.cpp\
+               richtooltipcmn.cpp persist.cpp time.cpp textmeasurecmn.cpp
 
 all : $(SOURCES)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS1)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS2)
+       $(MMS)$(MMSQUALIFIERS) $(OBJECTS3)
 .ifdef __WXMOTIF__
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS_MOTIF)
        library [--.lib]libwx_motif.olb $(OBJECTS)
        library [--.lib]libwx_motif.olb $(OBJECTS1)
        library [--.lib]libwx_motif.olb $(OBJECTS2)
+       library [--.lib]libwx_motif.olb $(OBJECTS3)
        library [--.lib]libwx_motif.olb $(OBJECTS_MOTIF)
 .else
 .ifdef __WXGTK__
@@ -441,6 +449,7 @@ all : $(SOURCES)
        library [--.lib]libwx_gtk.olb $(OBJECTS)
        library [--.lib]libwx_gtk.olb $(OBJECTS1)
        library [--.lib]libwx_gtk.olb $(OBJECTS2)
+       library [--.lib]libwx_gtk.olb $(OBJECTS3)
        library [--.lib]libwx_gtk.olb $(OBJECTS_X11)
 .else
 .ifdef __WXGTK2__
@@ -449,6 +458,7 @@ all : $(SOURCES)
        library [--.lib]libwx_gtk2.olb $(OBJECTS)
        library [--.lib]libwx_gtk2.olb $(OBJECTS1)
        library [--.lib]libwx_gtk2.olb $(OBJECTS2)
+       library [--.lib]libwx_gtk2.olb $(OBJECTS3)
        library [--.lib]libwx_gtk2.olb $(OBJECTS_X11)
        library [--.lib]libwx_gtk2.olb $(OBJECTS_GTK2)
 .else
@@ -457,6 +467,7 @@ all : $(SOURCES)
        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 $(OBJECTS3)
        library [--.lib]libwx_x11_univ.olb $(OBJECTS_X11)
 .endif
 .endif
@@ -466,6 +477,7 @@ all : $(SOURCES)
 $(OBJECTS) : [--.include.wx]setup.h
 $(OBJECTS1) : [--.include.wx]setup.h
 $(OBJECTS2) : [--.include.wx]setup.h
+$(OBJECTS3) : [--.include.wx]setup.h
 $(OBJECTS_X11) : [--.include.wx]setup.h
 $(OBJECTS_GTK2) : [--.include.wx]setup.h
 $(OBJECTS_MOTIF) : [--.include.wx]setup.h
@@ -693,3 +705,13 @@ gridcmn.obj : gridcmn.cpp
 odcombocmn.obj : odcombocmn.cpp
 spinbtncmn.obj : spinbtncmn.cpp
 scrolbarcmn.obj : scrolbarcmn.cpp
+colourdata.obj : colourdata.cpp
+fontdata.obj : fontdata.cpp
+valnum.obj : valnum.cpp
+numformatter.obj : numformatter.cpp
+markupparser.obj : markupparser.cpp
+affinematrix2d.obj : affinematrix2d.cpp
+richtooltipcmn.obj : richtooltipcmn.cpp
+persist.obj : persist.cpp
+time.obj : time.cpp
+textmeasurecmn.obj : textmeasurecmn.cpp