removed stray return from SetFont()

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

diff --git a/src/gtk/descrip.mms b/src/gtk/descrip.mms
index a4d74a08ca56eb6b16ac8b9a35745dc1da9a48d5..c94dd28c73d1e07e1302c6b261d1db1a2cab8312 100644 (file)
--- a/src/gtk/descrip.mms
+++ b/src/gtk/descrip.mms
@@ -1,8 +1,8 @@
 #*****************************************************************************
 #                                                                            *
 # 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 : 31 October 2006                                                     *
 #                                                                            *
 #*****************************************************************************
 .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
+.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
+.endif
 
 .suffixes : .cpp
 
@@ -28,10 +35,13 @@ CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/iee=denorm
 
 OBJECTS = \
        app.obj,\
+       artgtk.obj,\
        bitmap.obj,\
        brush.obj,\
        clipbrd.obj,\
+       colordlg.obj,\
        colour.obj,\
+       collpane.obj,\
        cursor.obj,\
        data.obj,\
        dataobj.obj,\
@@ -43,10 +53,8 @@ OBJECTS = \
         evtloop.obj,\
        filedlg.obj,\
        font.obj,\
-       gdiobj.obj,\
         glcanvas.obj,\
        gsockgtk.obj,\
-        icon.obj,\
        main.obj,\
        minifram.obj,\
        pen.obj,\
@@ -92,10 +100,12 @@ OBJECTS0= \
        tbargtk.obj,\
        textctrl.obj,\
        tglbtn.obj,\
-       msgdlg.obj
+       msgdlg.obj,\
+       treeentry_gtk.obj
 
 SOURCES =\
        app.cpp,\
+       artgtk.cpp, \
        bitmap.cpp,\
         bmpbuttn.cpp,\
        brush.cpp,\
@@ -104,7 +114,9 @@ SOURCES =\
        checklst.cpp,\
        choice.cpp,\
        clipbrd.cpp,\
+       colordlg.cpp,\
        colour.cpp,\
+       collpane.cpp,\
         combobox.cpp,\
        control.cpp,\
        cursor.cpp,\
@@ -122,10 +134,8 @@ SOURCES =\
        fontdlg.cpp,\
        frame.cpp,\
        gauge.cpp,\
-       gdiobj.cpp,\
         glcanvas.cpp,\
        gsockgtk.cpp,\
-        icon.cpp,\
        listbox.cpp,\
        main.cpp,\
        mdi.cpp,\
@@ -158,21 +168,30 @@ SOURCES =\
        utilsgtk.cpp,\
        utilsres.cpp,\
         win_gtk.c,\
-       window.cpp
+       window.cpp,\
+       treeentry_gtk.c
    
 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)
        library [--.lib]libwx_gtk.olb [.CXX_REPOSITORY]*.obj
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS0)
        library [--.lib]libwx_gtk.olb $(OBJECTS0)
 .endif
+.endif
 
 app.obj : app.cpp
+artgtk.obj : artgtk.cpp
 bitmap.obj : bitmap.cpp
 bmpbuttn.obj : bmpbuttn.cpp
 brush.obj : brush.cpp
@@ -181,7 +200,9 @@ checkbox.obj : checkbox.cpp
 checklst.obj : checklst.cpp
 choice.obj : choice.cpp
 clipbrd.obj :clipbrd.cpp
+colordlg.obj : colordlg.cpp
 colour.obj : colour.cpp
+collpane.obj : collpane.cpp
 combobox.obj : combobox.cpp
 control.obj : control.cpp
 cursor.obj : cursor.cpp
@@ -199,10 +220,8 @@ font.obj : font.cpp
 fontdlg.obj : fontdlg.cpp
 frame.obj : frame.cpp
 gauge.obj : gauge.cpp
-gdiobj.obj : gdiobj.cpp
 glcanvas.obj : glcanvas.cpp
 gsockgtk.obj : gsockgtk.cpp
-icon.obj : icon.cpp
 listbox.obj : listbox.cpp
 main.obj : main.cpp
 msgdlg.obj : msgdlg.cpp
@@ -236,3 +255,4 @@ utilsgtk.obj : utilsgtk.cpp
 utilsres.obj : utilsres.cpp
 win_gtk.obj : win_gtk.c
 window.obj : window.cpp
+treeentry_gtk.obj : treeentry_gtk.c