From 097b868b5a88879b1575b74883f736ae83444908 Mon Sep 17 00:00:00 2001 From: Jouk Jansen Date: Fri, 25 Aug 2006 06:56:52 +0000 Subject: [PATCH] Patches for OpenVMS port Modified Files: wxWidgets/setup.h_vms wxWidgets/src/common/descrip.mms wxWidgets/src/generic/descrip.mms wxWidgets/src/gtk/descrip.mms wxWidgets/src/gtk1/descrip.mms wxWidgets/src/motif/descrip.mms wxWidgets/src/x11/descrip.mms git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40813 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- setup.h_vms | 11 +++++++---- src/common/descrip.mms | 5 ++++- src/generic/descrip.mms | 8 +++++--- src/gtk/descrip.mms | 8 +------- src/gtk1/descrip.mms | 10 ++-------- src/motif/descrip.mms | 7 ++----- src/x11/descrip.mms | 10 ++-------- 7 files changed, 23 insertions(+), 36 deletions(-) diff --git a/setup.h_vms b/setup.h_vms index 382eebe..c270f9e 100644 --- a/setup.h_vms +++ b/setup.h_vms @@ -3,7 +3,7 @@ * Template for the set.h file for VMS * * Created from setup.h_in * * Author : J.Jansen (joukj@hrem.nano.tudelft.nl) * - * Date : 9 June 2006 * + * Date : 16 August 2006 * * * *****************************************************************************/ @@ -873,6 +873,10 @@ typedef pid_t GPid; * with 'char*' for the 3rd parameter instead of 'const char*' */ #undef HAVE_BROKEN_SNPRINTF_DECL +/* Define if you have a snprintf() which supports positional arguments + (defined in the unix98 standard) */ +#undef HAVE_UNIX98_PRINTF + /* define if you have statfs function */ #undef HAVE_STATFS @@ -1155,9 +1159,6 @@ typedef pid_t GPid; /* Define if you have Pango xft support */ #undef HAVE_PANGO_XFT -/* Define if you have the header file. */ -#undef HAVE_SYS_SELECT_H - /* --------------------------------------------------------------------- Win32 adjustments section --------------------------------------------------------------------- @@ -1189,4 +1190,6 @@ typedef pid_t GPid; /* define this when wxDC::Blit() respects SetDeviceOrigin() in wxGTK */ #define wxHAS_WORKING_GTK_DC_BLIT 1 +#undef HAVE_SYS_SELECT_H + #endif /* __WX_SETUP_H__ */ diff --git a/src/common/descrip.mms b/src/common/descrip.mms index 188a080..5e88373 100644 --- 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 : 29 May 2006 * +# Date : 18 August 2006 * # * #***************************************************************************** .first @@ -142,6 +142,7 @@ OBJECTS1=fs_inet.obj,\ nbkbase.obj,\ object.obj,\ paper.obj,\ + platinfo.obj,\ popupcmn.obj,\ prntbase.obj,\ process.obj,\ @@ -289,6 +290,7 @@ SOURCES = \ nbkbase.cpp,\ object.cpp,\ paper.cpp,\ + platinfo.cpp,\ popupcmn.cpp,\ prntbase.cpp,\ process.cpp,\ @@ -474,6 +476,7 @@ mstream.obj : mstream.cpp nbkbase.obj : nbkbase.cpp object.obj : object.cpp paper.obj : paper.cpp +platinfo.obj : platinfo.cpp popupcmn.obj : popupcmn.cpp prntbase.obj : prntbase.cpp process.obj : process.cpp diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms index 2fd3baf..50f5000 100644 --- 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) * -# Date : 10 February 2006 * +# Date : 18 August 2006 * # * #***************************************************************************** .first @@ -106,6 +106,7 @@ SOURCES = \ gridctrl.cpp,\ gridsel.cpp,\ helpext.cpp,\ + icon.cpp,\ imaglist.cpp,\ laywin.cpp,\ listbkg.cpp,\ @@ -152,9 +153,9 @@ OBJECTS0=,statusbr.obj,statline.obj,notebook.obj,spinctlg.obj .ifdef __WXX11__ OBJECTS0=,accel.obj,filedlgg.obj,dragimgg.obj,fdrepdlg.obj,htmllbox.obj,\ listbkg.obj,mdig.obj,spinctlg.obj,splash.obj,timer.obj,\ - vlbox.obj,vscroll.obj,combog.obj + vlbox.obj,vscroll.obj,combog.obj,icon.obj .else -OBJECTS0=,accel.obj,statusbr.obj,filedlgg.obj,paletteg.obj +OBJECTS0=,accel.obj,statusbr.obj,filedlgg.obj,paletteg.obj,icon.obj .endif .endif @@ -193,6 +194,7 @@ grid.obj : grid.cpp gridctrl.obj : gridctrl.cpp gridsel.obj : gridsel.cpp helpext.obj : helpext.cpp +icon.obj : icon.cpp imaglist.obj : imaglist.cpp laywin.obj : laywin.cpp listctrl.obj : listctrl.cpp diff --git a/src/gtk/descrip.mms b/src/gtk/descrip.mms index 6685e85..7ad600d 100644 --- a/src/gtk/descrip.mms +++ b/src/gtk/descrip.mms @@ -2,7 +2,7 @@ # * # Make file for VMS * # Author : J.Jansen (joukj@hrem.nano.tudelft.nl) * -# Date : 20 March 2006 * +# Date : 22 August 2006 * # * #***************************************************************************** .first @@ -52,10 +52,8 @@ OBJECTS = \ evtloop.obj,\ filedlg.obj,\ font.obj,\ - gdiobj.obj,\ glcanvas.obj,\ gsockgtk.obj,\ - icon.obj,\ main.obj,\ minifram.obj,\ pen.obj,\ @@ -134,10 +132,8 @@ SOURCES =\ fontdlg.cpp,\ frame.cpp,\ gauge.cpp,\ - gdiobj.cpp,\ glcanvas.cpp,\ gsockgtk.cpp,\ - icon.cpp,\ listbox.cpp,\ main.cpp,\ mdi.cpp,\ @@ -221,10 +217,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 diff --git a/src/gtk1/descrip.mms b/src/gtk1/descrip.mms index 039f98b..ad6fc43 100644 --- a/src/gtk1/descrip.mms +++ b/src/gtk1/descrip.mms @@ -1,8 +1,8 @@ #***************************************************************************** # * # Make file for VMS * -# Author : J.Jansen (joukj@hrem.stm.tudelft.nl) * -# Date : 2 May 2006 * +# Author : J.Jansen (joukj@hrem.nano.tudelft.nl) * +# Date : 18 August 2006 * # * #***************************************************************************** .first @@ -43,10 +43,8 @@ OBJECTS = \ evtloop.obj,\ filedlg.obj,\ font.obj,\ - gdiobj.obj,\ glcanvas.obj,\ gsockgtk.obj,\ - icon.obj,\ main.obj,\ minifram.obj,\ pen.obj,\ @@ -122,10 +120,8 @@ SOURCES =\ fontdlg.cpp,\ frame.cpp,\ gauge.cpp,\ - gdiobj.cpp,\ glcanvas.cpp,\ gsockgtk.cpp,\ - icon.cpp,\ listbox.cpp,\ main.cpp,\ mdi.cpp,\ @@ -199,10 +195,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 diff --git a/src/motif/descrip.mms b/src/motif/descrip.mms index caa5d6d..7292889 100644 --- a/src/motif/descrip.mms +++ b/src/motif/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 : 21 August 2006 * # * #***************************************************************************** .first @@ -50,7 +50,6 @@ OBJECTS = \ font.obj,\ frame.obj,\ gauge.obj,\ - gdiobj.obj,\ gsockmot.obj,\ icon.obj,\ listbox.obj,\ @@ -103,7 +102,6 @@ SOURCES = \ font.cpp,\ frame.cpp,\ gauge.cpp,\ - gdiobj.cpp,\ gsockmot.cpp,\ icon.cpp,\ listbox.cpp,\ @@ -165,7 +163,6 @@ filedlg.obj : filedlg.cpp font.obj : font.cpp frame.obj : frame.cpp gauge.obj : gauge.cpp -gdiobj.obj : gdiobj.cpp gsockmot.obj : gsockmot.cpp icon.obj : icon.cpp listbox.obj : listbox.cpp diff --git a/src/x11/descrip.mms b/src/x11/descrip.mms index d99f980..8ad7b6a 100644 --- a/src/x11/descrip.mms +++ b/src/x11/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 : 21 August 2006 * # * #***************************************************************************** .first @@ -44,9 +44,7 @@ OBJECTS_X11=app.obj,dc.obj,\ dcscreen.obj,\ evtloop.obj,\ font.obj,\ - gdiobj.obj,\ gsockx11.obj,\ - icon.obj,\ minifram.obj,\ nanox.obj,\ palette.obj,\ @@ -77,9 +75,7 @@ SOURCES = \ dcscreen.cpp,\ evtloop.cpp,\ font.cpp,\ - gdiobj.cpp,\ gsockx11.cpp,\ - icon.cpp,\ minifram.cpp,\ nanox.c,\ palette.cpp,\ @@ -119,9 +115,7 @@ dcmemory.obj : dcmemory.cpp dcscreen.obj : dcscreen.cpp evtloop.obj : evtloop.cpp font.obj : font.cpp -gdiobj.obj : gdiobj.cpp gsockx11.obj : gsockx11.cpp -icon.obj : icon.cpp minifram.obj : minifram.cpp nanox.obj : nanox.c palette.obj : palette.cpp -- 2.7.4