Committing in .

 first version of wxGTK2 for OpenVMS. At present for debugging only.

 Modified Files:
 	wxWidgets/descrip.mms wxWidgets/setup.h_vms
 	wxWidgets/contrib/src/deprecated/descrip.mms
 	wxWidgets/samples/minimal/descrip.mms
 	wxWidgets/src/common/descrip.mms
 	wxWidgets/src/generic/descrip.mms
 	wxWidgets/src/gtk/descrip.mms wxWidgets/src/html/descrip.mms
 	wxWidgets/src/unix/descrip.mms wxWidgets/src/xml/descrip.mms
 	wxWidgets/src/xrc/descrip.mms
 Added Files:
 	wxWidgets/lib/VMS_GTK2.OPT
 ----------------------------------------------------------------------

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37590 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/src/deprecated/descrip.mms b/contrib/src/deprecated/descrip.mms
index c06d58f71b59e5b109c3e0584636687ee538f49b..7e92facaac3f69e4083c3652c1de8fec5371b34c 100644 (file)
--- a/contrib/src/deprecated/descrip.mms
+++ b/contrib/src/deprecated/descrip.mms
@@ -1,8 +1,8 @@
 #*****************************************************************************
 #                                                                            *
 # Make file for VMS                                                          *
-# Author : J.Jansen (joukj@hrem.stm.tudelft.nl)                              *
-# Date : 24 April 2003                                                       *
+# Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
+# Date : 13 February 2006                                                    *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -14,6 +14,12 @@ CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\
           /assume=(nostdnew,noglobal_array_new)
 CC_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)
 .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
 .ifdef __WXGTK__
 .ifdef __WXUNIVERSAL__
 CXX_DEFINE = /define=(__WXGTK__=1,__WXUNIVERSAL__==1)/float=ieee\
@@ -30,6 +36,7 @@ CXX_DEFINE =
 CC_DEFINE =
 .endif
 .endif
+.endif
 
 YACC=bison/yacc
 
@@ -55,6 +62,9 @@ all : $(SOURCES)
 .ifdef __WXMOTIF__
        library/crea [---.lib]libwx_motif_deprecated.olb $(OBJECTS)
 .else
+.ifdef __WXGTK2__
+       library/crea [---.lib]libwx_gtk2_deprecated.olb $(OBJECTS)
+.else
 .ifdef __WXGTK__
 .ifdef __WXUNIVERSAL__
        library/crea [---.lib]libwx_gtk_univ_deprecated.olb $(OBJECTS)
@@ -63,6 +73,7 @@ all : $(SOURCES)
 .endif
 .endif
 .endif
+.endif
 
 prop.obj : prop.cpp
 propform.obj : propform.cpp

diff --git a/descrip.mms b/descrip.mms
index 9074a9928a843dbbb58152fb45528257d2809e96..2c672d234694e90b539922941639a75126c6f5a0 100644 (file)
--- a/descrip.mms
+++ b/descrip.mms
@@ -1,8 +1,8 @@
 #*****************************************************************************
 #                                                                            *
 # 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 : 13 February 2006                                                    *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -26,6 +26,9 @@ all :
        make x11
        purge [...]
        delete [...]*.obj;
+       if f$search("GNOME$ROOT:[000000]GLIB2.COM") .nes. "" then make gtk2
+       if f$search("GNOME$ROOT:[000000]GLIB2.COM") .nes. "" then purge [...]
+       if f$search("GNOME$ROOT:[000000]GLIB2.COM") .nes. "" then delete [...]*.obj;
 
 gtk : [.include.wx]setup.h
        set default [.src.generic]
@@ -82,6 +85,63 @@ gtk : [.include.wx]setup.h
 #      $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
        set default [--]
 
+gtk2 : [.include.wx]setup.h
+       @gnome$root:[000000]glib2
+       set default [.src.generic]
+       $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
+       set default [-.common]
+       $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
+       set default [-.html]
+       $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
+       set default [-.xml]
+       $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
+       set default [-.xrc]
+       $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
+       set default [-.unix]
+       $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
+       set default [-.gtk]
+       $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
+       set default [--.contrib.src.deprecated]
+       $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
+       set default [---.demos.bombs]
+#      $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
+       set default [--.samples.calendar]
+#      $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
+       set default [-.caret]
+#      $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
+       set default [-.checklst]
+#      $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
+       set default [-.config]
+#      $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
+       set default [-.controls]
+#      $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
+       set default [-.db]
+#      $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
+       set default [-.dialogs]
+#      $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
+       set default [-.dialup]
+#      $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
+       set default [-.dnd]
+#      $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
+       set default [-.docview]
+#      $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
+       set default [-.drawing]
+#      $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
+       set default [-.font]
+#      $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
+       set default [-.image]
+#      $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
+       set default [-.mdi]
+#      $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
+       set default [-.menu]
+#      $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
+       set default [-.minimal]
+       $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
+       set default [-.richedit]
+#      $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
+       set default [--]
+       @gnome$root:[000000]glib
+
 x11 : [.include.wx]setup.h
        set default [.src.generic]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)

diff --git a/lib/VMS_GTK2.OPT b/lib/VMS_GTK2.OPT
new file mode 100755 (executable)
index 0000000..20aed86
--- /dev/null
+++ b/lib/VMS_GTK2.OPT
@@ -0,0 +1,15 @@
+wx_root:[wxwidgets.lib]libwx_gtk2.olb/lib
+sys$library:libjpeg.olb/lib
+sys$library:libpng.olb/lib
+sys$library:libz.olb/lib
+sys$library:tiff.olb/lib
+X11:libxpm.olb/lib
+sys$share:libgtk2.exe/share
+sys$share:libgdk-pixbuf.exe/share
+sys$share:libgdk2.exe/share
+sys$share:libpango.exe/share
+sys$share:libglib2.exe/share
+sys$share:iodbc.exe/share
+sys$share:vms_jackets.exe/share
+sys$share:pthread$rtl.exe/share
+sys$library:decw$xlibshr.exe/share

diff --git a/samples/minimal/descrip.mms b/samples/minimal/descrip.mms
index 12281e13c2b4fbe0d33c85ab9b726bf3093ed37c..4758fcc7dd083520ddc94c90636cf29d04519f66 100644 (file)
--- a/samples/minimal/descrip.mms
+++ b/samples/minimal/descrip.mms
@@ -1,8 +1,8 @@
 #*****************************************************************************
 #                                                                            *
 # Make file for VMS                                                          *
-# Author : J.Jansen (joukj@hrem.stm.tudelft.nl)                              *
-# Date : 10 November 1999                                                     *
+# Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
+# Date : 13 February 2006                                                    *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -16,6 +16,10 @@ CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\
 CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm\
           /assume=(nostdnew,noglobal_array_new)
 .else
+.ifdef __WXGTK2__
+CXX_DEFINE = /define=(__WXGTK__=1,VMS_GTK2=1)/float=ieee/name=(as_is,short)/ieee=denorm\
+          /assume=(nostdnew,noglobal_array_new)
+.else
 .ifdef __WXX11__
 CXX_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
        /name=(as_is,short)/assume=(nostdnew,noglobal_array_new)
@@ -24,6 +28,7 @@ CXX_DEFINE =
 .endif
 .endif
 .endif
+.endif
 
 .suffixes : .cpp
 
@@ -37,11 +42,15 @@ all :
 .ifdef __WXGTK__
        $(MMS)$(MMSQUALIFIERS) minimal_gtk.exe
 .else
+.ifdef __WXGTK2__
+       $(MMS)$(MMSQUALIFIERS) minimal_gtk2.exe
+.else
 .ifdef __WXX11__
        $(MMS)$(MMSQUALIFIERS) minimal_x11.exe
 .endif
 .endif
 .endif
+.endif
 
 .ifdef __WXMOTIF__
 minimal.exe : minimal.obj
@@ -51,11 +60,16 @@ minimal.exe : minimal.obj
 minimal_gtk.exe : minimal.obj
        cxxlink/exec=minimal_gtk.exe minimal,[--.lib]vms_gtk/opt
 .else
+.ifdef __WXGTK2__
+minimal_gtk2.exe : minimal.obj
+       cxxlink/exec=minimal_gtk2.exe minimal,[--.lib]vms_gtk2/opt
+.else
 .ifdef __WXX11__
 minimal_x11.exe : minimal.obj
        cxxlink/exec=minimal_x11.exe minimal,[--.lib]vms_x11_univ/opt
 .endif
 .endif
 .endif
+.endif
 
 minimal.obj : minimal.cpp

diff --git a/setup.h_vms b/setup.h_vms
index 1b5cd7fdf5934af47ddf56ed9a6a30b78b9f5bad..7a5607d9e7dc8fd011dc9fc8ee9a6bfcf7f8cb2f 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -2,8 +2,8 @@
  *                                                                           *
  * Template for the set.h file for VMS                                       *
  * Created from setup.h_in                                                   *
- * Author : J.Jansen (joukj@hrem.stm.tudelft.nl)                             *
- * Date : 18 August 2005                                                     *
+ * Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                            *
+ * Date : 9 February 2006                                                    *
  *                                                                           *
  *****************************************************************************/
 
@@ -79,10 +79,18 @@
 #define __WXGTK127__ 1
 
 /* Define this if your version of GTK+ is greater than 2.0 */
-/* #undef __WXGTK20__ */
+#ifdef VMS_GTK2
+#define __WXGTK20__ 1
 
 /* Define this if your version of GTK+ is greater than 2.4 */
-/* #undef __WXGTK24__ */
+#define __WXGTK24__ 1
+
+#include <types.h>
+typedef pid_t GPid;
+
+#define G_GNUC_INTERNAL
+
+#endif
 #endif
 
 /*
@@ -346,6 +354,8 @@
 
 #define wxUSE_TREEBOOK 1
 
+#define wxUSE_TOOLBOOK 1
+
 #define wxUSE_TAB_DIALOG    1
 
 #define wxUSE_GRID         1

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index 6926bd47a9d3c53c145f3d92de34e427b3685a11..2efbfebef78612128a63f9180286f76283dbcf0a 100644 (file)
--- a/src/common/descrip.mms
+++ b/src/common/descrip.mms
@@ -18,6 +18,11 @@ 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
+.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
 .ifdef __WXX11__
 CXX_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
        /name=(as_is,short)/assume=(nostdnew,noglobal_array_new)
@@ -29,6 +34,7 @@ CC_DEFINE =
 .endif
 .endif
 .endif
+.endif
 
 YACC=bison/yacc
 
@@ -352,6 +358,11 @@ all : $(SOURCES)
        library [--.lib]libwx_gtk.olb $(OBJECTS1)
        library [--.lib]libwx_gtk.olb $(OBJECTS2)
 .else
+.ifdef __WXGTK2__
+       library [--.lib]libwx_gtk2.olb $(OBJECTS)
+       library [--.lib]libwx_gtk2.olb $(OBJECTS1)
+       library [--.lib]libwx_gtk2.olb $(OBJECTS2)
+.else
 .ifdef __WXX11__
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS_X11)
        library [--.lib]libwx_x11_univ.olb $(OBJECTS)
@@ -361,6 +372,7 @@ all : $(SOURCES)
 .endif
 .endif
 .endif
+.endif
 
 appbase.obj : appbase.cpp
 appcmn.obj : appcmn.cpp

diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms
index 690964ef8779fe33e3e27a50bf98c581d1b4b68c..1a0407e87bf790f56bb78cece0d676dd723a0d75 100644 (file)
--- a/src/generic/descrip.mms
+++ b/src/generic/descrip.mms
@@ -1,8 +1,8 @@
 #*****************************************************************************
 #                                                                            *
 # 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 : 10 February 2006                                                    *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -24,11 +24,18 @@ CXX_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
 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
 .endif
+.endif
 
 .suffixes : .cpp
 
@@ -41,6 +48,7 @@ OBJECTS = \
                busyinfo.obj,\
                calctrl.obj,\
                caret.obj,\
+               choicbkg.obj,\
                choicdgg.obj,\
                colrdlgg.obj,\
                datectlg.obj,\
@@ -55,6 +63,7 @@ OBJECTS = \
                helpext.obj,\
                imaglist.obj,\
                laywin.obj,\
+               listbkg.obj,\
                listctrl.obj,\
                logg.obj,\
                msgdlgg.obj,\
@@ -73,6 +82,8 @@ OBJECTS = \
                textdlgg.obj,\
                tipdlg.obj,\
                tipwin.obj,\
+               toolbkg.obj,\
+               treebkg.obj,\
                treectlg.obj,\
                wizard.obj
 
@@ -81,6 +92,7 @@ SOURCES = \
                busyinfo.cpp,\
                calctrl.cpp,\
                caret.cpp,\
+               choicbkg.cpp,\
                choicdgg.cpp,\
                colrdlgg.cpp,\
                datectlg.cpp,\
@@ -96,6 +108,7 @@ SOURCES = \
                helpext.cpp,\
                imaglist.cpp,\
                laywin.cpp,\
+               listbkg.cpp,\
                listctrl.cpp,\
                logg.cpp,\
                msgdlgg.cpp,\
@@ -117,6 +130,8 @@ SOURCES = \
                textdlgg.cpp,\
                tipdlg.cpp,\
                tipwin.cpp,\
+               toolbkg.cpp,\
+               treebkg.cpp,\
                treectlg.cpp,\
                wizard.cpp,\
                dragimgg.cpp,\
@@ -151,11 +166,15 @@ all : $(SOURCES)
 .ifdef __WXGTK__
        library/crea [--.lib]libwx_gtk.olb $(OBJECTS)$(OBJECTS0)
 .else
+.ifdef __WXGTK2__
+       library/crea [--.lib]libwx_gtk2.olb $(OBJECTS)$(OBJECTS0)
+.else
 .ifdef __WXX11__
        library/crea [--.lib]libwx_x11_univ.olb $(OBJECTS)$(OBJECTS0)
 .endif
 .endif
 .endif
+.endif
 
 accel.obj : accel.cpp
 busyinfo.obj : busyinfo.cpp
@@ -212,3 +231,7 @@ splash.obj : splash.cpp
 timer.obj : timer.cpp
 vlbox.obj : vlbox.cpp
 vscroll.obj : vscroll.cpp
+listbkg.obj : listbkg.cpp
+choicbkg.obj : choicbkg.cpp
+toolbkg.obj : toolbkg.cpp
+treebkg.obj : treebkg.cpp

diff --git a/src/gtk/descrip.mms b/src/gtk/descrip.mms
index a4d74a08ca56eb6b16ac8b9a35745dc1da9a48d5..c836e9f5c912d6b602e12f8571401640a5f0197d 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 : 13 February 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,6 +35,7 @@ CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/iee=denorm
 
 OBJECTS = \
        app.obj,\
+       artgtk.obj,\
        bitmap.obj,\
        brush.obj,\
        clipbrd.obj,\
@@ -96,6 +104,7 @@ OBJECTS0= \
 
 SOURCES =\
        app.cpp,\
+       artgtk.cpp, \
        bitmap.cpp,\
         bmpbuttn.cpp,\
        brush.cpp,\
@@ -165,14 +174,22 @@ all : $(SOURCES)
 .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

diff --git a/src/html/descrip.mms b/src/html/descrip.mms
index 4b74e14267de2e7eb49dbd300b1029c3a3c17607..11ab81f5a14dd0946bd9371627251201e75a5716 100644 (file)
--- a/src/html/descrip.mms
+++ b/src/html/descrip.mms
@@ -1,8 +1,8 @@
 #*****************************************************************************
 #                                                                            *
 # Make file for VMS                                                          *
-# Author : J.Jansen (joukj@hrem.stm.tudelft.nl)                              *
-# Date : 4 October 2001                                                      *
+# Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
+# Date : 13 February 2006                                                    *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -18,6 +18,11 @@ 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
+.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
 .ifdef __WXX11__
 CXX_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
        /name=(as_is,short)/assume=(nostdnew,noglobal_array_new)
@@ -29,6 +34,7 @@ CC_DEFINE =
 .endif
 .endif
 .endif
+.endif
 
 .suffixes : .cpp
 
@@ -57,11 +63,15 @@ all : $(SOURCES)
 .ifdef __WXGTK__
        library [--.lib]libwx_gtk.olb $(OBJECTS)
 .else
+.ifdef __WXGTK2__
+       library [--.lib]libwx_gtk2.olb $(OBJECTS)
+.else
 .ifdef __WXX11__
        library [--.lib]libwx_x11_univ.olb $(OBJECTS)
 .endif
 .endif
 .endif
+.endif
 
 helpctrl.obj : helpctrl.cpp
 helpdata.obj : helpdata.cpp

diff --git a/src/unix/descrip.mms b/src/unix/descrip.mms
index 10f7ee30ff9b89d928a842d0742533b92025547d..851ce12921b521e279a3cf75adb7613c116167b3 100644 (file)
--- a/src/unix/descrip.mms
+++ b/src/unix/descrip.mms
@@ -1,8 +1,8 @@
 #*****************************************************************************
 #                                                                            *
 # Make file for VMS                                                          *
-# Author : J.Jansen (joukj@hrem.stm.tudelft.nl)                              *
-# Date : 10 November 1999                                                     *
+# Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
+# Date : 13 February 2006                                                    *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -18,6 +18,11 @@ 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
+.ifdef __WXGTK2__
+CXX_DEFINE = /define=(__WXGTK__=1,VMS_GTK2)/float=ieee/name=(as_is,short)/ieee=denorm\
+          /assume=(nostdnew,noglobal_array_new)
+CC_DEFINE = /define=(__WXGTK__=1,VMS_GTK2)/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)
@@ -29,6 +34,7 @@ CC_DEFINE =
 .endif
 .endif
 .endif
+.endif
 
 .suffixes : .cpp
 
@@ -81,11 +87,15 @@ all : $(SOURCES)
 .ifdef __WXGTK__
        library [--.lib]libwx_gtk.olb $(OBJECTS)
 .else
+.ifdef __WXGTK2__
+       library [--.lib]libwx_gtk2.olb $(OBJECTS)
+.else
 .ifdef __WXX11__
        library [--.lib]libwx_x11_univ.olb $(OBJECTS)
 .endif
 .endif
 .endif
+.endif
 
 baseunix.obj : baseunix.cpp
 dialup.obj : dialup.cpp

diff --git a/src/xml/descrip.mms b/src/xml/descrip.mms
index ce55ac61f032c0c015c336ed5b1cfa7e2424e089..f79bab55cb234a24557de4544f762fb78bdf8335 100755 (executable)
--- a/src/xml/descrip.mms
+++ b/src/xml/descrip.mms
@@ -1,8 +1,8 @@
 #*****************************************************************************
 #                                                                            *
 # Make file for VMS                                                          *
-# Author : J.Jansen (joukj@hrem.stm.tudelft.nl)                              *
-# Date : 20 October 2004                                                      *
+# Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
+# Date : 13 February 2006                                                    *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -18,6 +18,11 @@ 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
+.ifdef __WXGTK2__
+CXX_DEFINE = /define=(__WXGTK__=1,VMS_GTK2)/float=ieee/name=(as_is,short)/ieee=denorm\
+          /assume=(nostdnew,noglobal_array_new)
+CC_DEFINE = /define=(__WXGTK__=1,VMS_GTK2)/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)
@@ -29,6 +34,7 @@ CC_DEFINE =
 .endif
 .endif
 .endif
+.endif
 
 .suffixes : .cpp
 
@@ -49,10 +55,14 @@ all : $(SOURCES)
 .ifdef __WXGTK__
        library [--.lib]libwx_gtk.olb $(OBJECTS)
 .else
+.ifdef __WXGTK2__
+       library [--.lib]libwx_gtk2.olb $(OBJECTS)
+.else
 .ifdef __WXX11__
        library [--.lib]libwx_x11_univ.olb $(OBJECTS)
 .endif
 .endif
 .endif
+.endif
 
 xml.obj : xml.cpp

diff --git a/src/xrc/descrip.mms b/src/xrc/descrip.mms
index c2058df5f518a3f189e7c168df9786ab0c6cf007..82a2a262d7ffb83da8e7afb1be5c0421766ac271 100755 (executable)
--- a/src/xrc/descrip.mms
+++ b/src/xrc/descrip.mms
@@ -1,8 +1,8 @@
 #*****************************************************************************
 #                                                                            *
 # Make file for VMS                                                          *
-# Author : J.Jansen (joukj@hrem.stm.tudelft.nl)                              *
-# Date : 20 October 2004                                                      *
+# Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
+# Date : 13 February 2006                                                    *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -18,6 +18,11 @@ 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
+.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
 .ifdef __WXX11__
 CXX_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
        /name=(as_is,short)/assume=(nostdnew,noglobal_array_new)
@@ -29,6 +34,7 @@ CC_DEFINE =
 .endif
 .endif
 .endif
+.endif
 
 .suffixes : .cpp
 
@@ -63,11 +69,15 @@ all : $(SOURCES)
 .ifdef __WXGTK__
        library [--.lib]libwx_gtk.olb $(OBJECTS)
 .else
+.ifdef __WXGTK2__
+       library [--.lib]libwx_gtk2.olb $(OBJECTS)
+.else
 .ifdef __WXX11__
        library [--.lib]libwx_x11_univ.olb $(OBJECTS)
 .endif
 .endif
 .endif
+.endif
 
 xh_bmp.obj : xh_bmp.cpp
 xh_bmpbt.obj : xh_bmpbt.cpp