Merge in from trunk r64802 - r68625

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

diff --git a/src/gtk/descrip.mms b/src/gtk/descrip.mms
index 1587c695e7e3a6d28e811f396aa3146b0edae367..2d747f4dc8f5bd393a0e6c0d02dd166e183426c7 100644 (file)
--- a/src/gtk/descrip.mms
+++ b/src/gtk/descrip.mms
@@ -1,8 +1,8 @@
 #*****************************************************************************
 #                                                                            *
 # Make file for VMS                                                          *
 #*****************************************************************************
 #                                                                            *
 # Make file for VMS                                                          *

-# Author : J.Jansen (joukj@hrem.stm.tudelft.nl)                              *
-# Date : 2 March 2000                                                        *
+# Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
+# Date : 16 June 2011                                                        *

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


@@ -14,10 +14,17 @@ CXX_DEFINE = /define=(__WXGTK__=1,__WXUNIVERSAL__==1)/float=ieee\
 CC_DEFINE = /define=(__WXGTK__=1,__WXUNIVERSAL__==1)/float=ieee\
        /name=(as_is,short)/ieee=denorm
 .else
 CC_DEFINE = /define=(__WXGTK__=1,__WXUNIVERSAL__==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
+.else

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

+.endif

 
 .suffixes : .cpp
 
 
 .suffixes : .cpp
 


@@ -27,36 +34,37 @@ CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/iee=denorm
        cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
 
 OBJECTS = \
        cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
 
 OBJECTS = \

+       animate.obj,\

        app.obj,\
        app.obj,\

+       artgtk.obj,\

        bitmap.obj,\
        brush.obj,\
        clipbrd.obj,\
        bitmap.obj,\
        brush.obj,\
        clipbrd.obj,\

+       colordlg.obj,\

        colour.obj,\
        colour.obj,\

+       collpane.obj,\

        cursor.obj,\
        cursor.obj,\

-       data.obj,\

        dataobj.obj,\
        dc.obj,\
        dcclient.obj,\
        dcmemory.obj,\
        dcscreen.obj,\
         dnd.obj,\
        dataobj.obj,\
        dc.obj,\
        dcclient.obj,\
        dcmemory.obj,\
        dcscreen.obj,\
         dnd.obj,\

+        evtloop.obj,\
+       filedlg.obj,\

        font.obj,\
        font.obj,\

-       gdiobj.obj,\

         glcanvas.obj,\
         glcanvas.obj,\

-       gsockgtk.obj,\
-        icon.obj,\
-       main.obj,\
+       sockgtk.obj,\

        minifram.obj,\
        pen.obj,\
        popupwin.obj,\
        minifram.obj,\
        pen.obj,\
        popupwin.obj,\

+       renderer.obj,\

        region.obj,\
        settings.obj,\
        timer.obj,\
        tooltip.obj,\
        toplevel.obj,\
        utilsgtk.obj,\
        region.obj,\
        settings.obj,\
        timer.obj,\
        tooltip.obj,\
        toplevel.obj,\
        utilsgtk.obj,\

-       utilsres.obj,\
-        win_gtk.obj,\

        window.obj
 
 OBJECTS0= \
        window.obj
 
 OBJECTS0= \


@@ -86,13 +94,17 @@ OBJECTS0= \
        statbox.obj,\
        statline.obj,\
        stattext.obj,\
        statbox.obj,\
        statline.obj,\
        stattext.obj,\

-       tbargtk.obj,\
+       toolbar.obj,\

        textctrl.obj,\
        tglbtn.obj,\
        textctrl.obj,\
        tglbtn.obj,\

-       msgdlg.obj
+       msgdlg.obj,\
+       treeentry_gtk.obj,textentry.obj,filectrl.obj,print.obj,win_gtk.obj,\
+       mnemonics.obj,private.obj,assertdlg_gtk.obj,infobar.obj,anybutton.obj

 
 SOURCES =\
 
 SOURCES =\

+       animate.cpp,\

        app.cpp,\
        app.cpp,\

+       artgtk.cpp, \

        bitmap.cpp,\
         bmpbuttn.cpp,\
        brush.cpp,\
        bitmap.cpp,\
         bmpbuttn.cpp,\
        brush.cpp,\


@@ -101,11 +113,12 @@ SOURCES =\
        checklst.cpp,\
        choice.cpp,\
        clipbrd.cpp,\
        checklst.cpp,\
        choice.cpp,\
        clipbrd.cpp,\

+       colordlg.cpp,\

        colour.cpp,\
        colour.cpp,\

+       collpane.cpp,\

         combobox.cpp,\
        control.cpp,\
        cursor.cpp,\
         combobox.cpp,\
        control.cpp,\
        cursor.cpp,\

-       data.cpp,\

        dataobj.cpp,\
        dc.cpp,\
        dcclient.cpp,\
        dataobj.cpp,\
        dc.cpp,\
        dcclient.cpp,\


@@ -113,16 +126,15 @@ SOURCES =\
        dcscreen.cpp,\
        dialog.cpp,\
         dnd.cpp,\
        dcscreen.cpp,\
        dialog.cpp,\
         dnd.cpp,\

+        evtloop.cpp,\
+       filedlg.cpp,\

        font.cpp,\
        fontdlg.cpp,\
        frame.cpp,\
        gauge.cpp,\
        font.cpp,\
        fontdlg.cpp,\
        frame.cpp,\
        gauge.cpp,\

-       gdiobj.cpp,\

         glcanvas.cpp,\
         glcanvas.cpp,\

-       gsockgtk.c,\
-        icon.cpp,\
+       sockgtk.cpp,\

        listbox.cpp,\
        listbox.cpp,\

-       main.cpp,\

        mdi.cpp,\
        menu.cpp,\
        minifram.cpp,\
        mdi.cpp,\
        menu.cpp,\
        minifram.cpp,\


@@ -132,6 +144,7 @@ SOURCES =\
        popupwin.cpp,\
        radiobox.cpp,\
        radiobut.cpp,\
        popupwin.cpp,\
        radiobox.cpp,\
        radiobut.cpp,\

+       renderer.cpp,\

        region.cpp,\
        scrolbar.cpp,\
        scrolwin.cpp,\
        region.cpp,\
        scrolbar.cpp,\
        scrolwin.cpp,\


@@ -143,28 +156,42 @@ SOURCES =\
        statbox.cpp,\
        statline.cpp,\
        stattext.cpp,\
        statbox.cpp,\
        statline.cpp,\
        stattext.cpp,\

-       tbargtk.cpp,\
+       toolbar.cpp,\

        textctrl.cpp,\
        tglbtn.cpp,\
        timer.cpp,\
        tooltip.cpp,\
        toplevel.cpp,\
        utilsgtk.cpp,\
        textctrl.cpp,\
        tglbtn.cpp,\
        timer.cpp,\
        tooltip.cpp,\
        toplevel.cpp,\
        utilsgtk.cpp,\

-       utilsres.cpp,\
-        win_gtk.c,\
-       window.cpp
-   
+       window.cpp,\
+       treeentry_gtk.c,textentry.cpp,filectrl.cpp,print.cpp,win_gtk.cpp,\
+       mnemonics.cpp,private.cpp,assertdlg_gtk.cpp,infobar.cpp,anybutton.cpp
+

 all : $(SOURCES)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS)
 .ifdef __WXUNIVERSAL__
        library [--.lib]libwx_gtk_univ.olb $(OBJECTS)
 all : $(SOURCES)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS)
 .ifdef __WXUNIVERSAL__
        library [--.lib]libwx_gtk_univ.olb $(OBJECTS)

+       library [--.lib]libwx_gtk_univ.olb [.CXX_REPOSITORY]*.obj
+.else
+.ifdef __WXGTK2__
+       library [--.lib]libwx_gtk2.olb $(OBJECTS)
+       library [--.lib]libwx_gtk2.olb [.CXX_REPOSITORY]*.obj
+       $(MMS)$(MMSQUALIFIERS) $(OBJECTS0)
+       library [--.lib]libwx_gtk2.olb $(OBJECTS0)

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

+       library [--.lib]libwx_gtk.olb [.CXX_REPOSITORY]*.obj

        $(MMS)$(MMSQUALIFIERS) $(OBJECTS0)
        library [--.lib]libwx_gtk.olb $(OBJECTS0)
 .endif
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS0)
        library [--.lib]libwx_gtk.olb $(OBJECTS0)
 .endif

+.endif
+
+$(OBJECTS) : [--.include.wx]setup.h
+$(OBJECTS0) : [--.include.wx]setup.h

 
 

+animate.obj : animate.cpp

 app.obj : app.cpp
 app.obj : app.cpp

+artgtk.obj : artgtk.cpp

 bitmap.obj : bitmap.cpp
 bmpbuttn.obj : bmpbuttn.cpp
 brush.obj : brush.cpp
 bitmap.obj : bitmap.cpp
 bmpbuttn.obj : bmpbuttn.cpp
 brush.obj : brush.cpp


@@ -173,11 +200,12 @@ checkbox.obj : checkbox.cpp
 checklst.obj : checklst.cpp
 choice.obj : choice.cpp
 clipbrd.obj :clipbrd.cpp
 checklst.obj : checklst.cpp
 choice.obj : choice.cpp
 clipbrd.obj :clipbrd.cpp

+colordlg.obj : colordlg.cpp

 colour.obj : colour.cpp
 colour.obj : colour.cpp

+collpane.obj : collpane.cpp

 combobox.obj : combobox.cpp
 control.obj : control.cpp
 cursor.obj : cursor.cpp
 combobox.obj : combobox.cpp
 control.obj : control.cpp
 cursor.obj : cursor.cpp

-data.obj : data.cpp

 dataobj.obj : dataobj.cpp
 dc.obj : dc.cpp
 dcclient.obj : dcclient.cpp
 dataobj.obj : dataobj.cpp
 dc.obj : dc.cpp
 dcclient.obj : dcclient.cpp


@@ -185,16 +213,15 @@ dcmemory.obj : dcmemory.cpp
 dcscreen.obj : dcscreen.cpp
 dialog.obj : dialog.cpp
 dnd.obj : dnd.cpp
 dcscreen.obj : dcscreen.cpp
 dialog.obj : dialog.cpp
 dnd.obj : dnd.cpp

+evtloop.obj : evtloop.cpp
+filedlg.obj : filedlg.cpp

 font.obj : font.cpp
 fontdlg.obj : fontdlg.cpp
 frame.obj : frame.cpp
 gauge.obj : gauge.cpp
 font.obj : font.cpp
 fontdlg.obj : fontdlg.cpp
 frame.obj : frame.cpp
 gauge.obj : gauge.cpp

-gdiobj.obj : gdiobj.cpp

 glcanvas.obj : glcanvas.cpp
 glcanvas.obj : glcanvas.cpp

-gsockgtk.obj : gsockgtk.c
-icon.obj : icon.cpp
+sockgtk.obj : sockgtk.cpp

 listbox.obj : listbox.cpp
 listbox.obj : listbox.cpp

-main.obj : main.cpp

 msgdlg.obj : msgdlg.cpp
 mdi.obj : mdi.cpp
 menu.obj : menu.cpp
 msgdlg.obj : msgdlg.cpp
 mdi.obj : mdi.cpp
 menu.obj : menu.cpp


@@ -204,6 +231,7 @@ pen.obj : pen.cpp
 popupwin.obj : popupwin.cpp
 radiobox.obj : radiobox.cpp
 radiobut.obj : radiobut.cpp
 popupwin.obj : popupwin.cpp
 radiobox.obj : radiobox.cpp
 radiobut.obj : radiobut.cpp

+renderer.obj : renderer.cpp

 region.obj : region.cpp
 scrolbar.obj : scrolbar.cpp
 scrolwin.obj : scrolwin.cpp
 region.obj : region.cpp
 scrolbar.obj : scrolbar.cpp
 scrolwin.obj : scrolwin.cpp


@@ -215,13 +243,21 @@ statbmp.obj : statbmp.cpp
 statbox.obj : statbox.cpp
 statline.obj : statline.cpp
 stattext.obj : stattext.cpp
 statbox.obj : statbox.cpp
 statline.obj : statline.cpp
 stattext.obj : stattext.cpp

-tbargtk.obj : tbargtk.cpp
+toolbar.obj : toolbar.cpp

 textctrl.obj : textctrl.cpp
 tglbtn.obj : tglbtn.cpp
 timer.obj : timer.cpp
 tooltip.obj : tooltip.cpp
 toplevel.obj : toplevel.cpp
 utilsgtk.obj : utilsgtk.cpp
 textctrl.obj : textctrl.cpp
 tglbtn.obj : tglbtn.cpp
 timer.obj : timer.cpp
 tooltip.obj : tooltip.cpp
 toplevel.obj : toplevel.cpp
 utilsgtk.obj : utilsgtk.cpp

-utilsres.obj : utilsres.cpp
-win_gtk.obj : win_gtk.c

 window.obj : window.cpp
 window.obj : window.cpp

+treeentry_gtk.obj : treeentry_gtk.c
+textentry.obj : textentry.cpp
+filectrl.obj : filectrl.cpp
+print.obj : print.cpp
+win_gtk.obj : win_gtk.cpp
+mnemonics.obj : mnemonics.cpp
+private.obj : private.cpp
+assertdlg_gtk.obj : assertdlg_gtk.cpp
+infobar.obj : infobar.cpp
+anybutton.obj : anybutton.cpp