From ce4070fc162e07510db82ad61c6fe05457a2a4ed Mon Sep 17 00:00:00 2001 From: Jouk Date: Tue, 14 Jun 2016 14:11:38 +0200 Subject: [PATCH] Enabling wxUSE_GRAPHICS_CONTEXT on OpenVMS --- setup.h_vms | 4 ++-- src/common/descrip.mms | 10 +++++++--- src/generic/descrip.mms | 7 ++++--- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/setup.h_vms b/setup.h_vms index 63afb9032a..f93c131e1c 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 : 7 June 2016 * + * Date : 14 June 2016 * * * *****************************************************************************/ @@ -401,7 +401,7 @@ typedef pid_t GPid; #ifdef __WXGTK3__ # define wxUSE_GRAPHICS_CONTEXT 1 #else -# define wxUSE_GRAPHICS_CONTEXT 0 +# define wxUSE_GRAPHICS_CONTEXT 1 #endif #endif diff --git a/src/common/descrip.mms b/src/common/descrip.mms index b33d864ca8..173ffec46b 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 : 2 May 2016 * +# Date : 14 June 2016 * # * #***************************************************************************** .first @@ -226,7 +226,8 @@ OBJECTS3=listctrlcmn.obj,socketiohandler.obj,fdiodispatcher.obj,\ valnum.obj,numformatter.obj,markupparser.obj,\ affinematrix2d.obj,richtooltipcmn.obj,persist.obj,time.obj,\ textmeasurecmn.obj,modalhook.obj,threadinfo.obj,\ - addremovectrl.obj,notifmsgcmn.obj + addremovectrl.obj,notifmsgcmn.obj,graphcmn.obj,dcsvg.obj,\ + dcgraph.obj OBJECTS_MOTIF=radiocmn.obj,combocmn.obj @@ -431,7 +432,7 @@ SOURCES = \ gridcmn.cpp,odcombocmn.cpp,spinbtncmn.cpp,scrolbarcmn.cpp,\ colourdata.cpp,fontdata.cpp affinematrix2d.cpp\ richtooltipcmn.cpp persist.cpp time.cpp textmeasurecmn.cpp \ - modalhook.cpp + modalhook.cpp graphcmn.cpp dcsvg.cpp dcgraph.cpp all : $(SOURCES) $(MMS)$(MMSQUALIFIERS) $(OBJECTS) @@ -724,3 +725,6 @@ modalhook.obj : modalhook.cpp threadinfo.obj : threadinfo.cpp addremovectrl.obj : addremovectrl.cpp notifmsgcmn.obj : notifmsgcmn.cpp +graphcmn.obj : graphcmn.cpp +dcsvg.obj : dcsvg.cpp +dcgraph.obj : dcgraph.cpp diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms index 05355a33c1..d9fdf3e7c2 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 : 22 September 2015 * +# Date : 14 June 2016 * # * #***************************************************************************** .first @@ -95,7 +95,7 @@ OBJECTS = \ editlbox.obj,datavgen.obj,dbgrptg.obj,dragimgg.obj,\ richmsgdlgg.obj,commandlinkbuttong.obj,spinctlg.obj,\ markuptext.obj,bannerwindow.obj,timectrlg.obj,richtooltipg.obj\ - ,statbmpg.obj,splash.obj,collheaderctrlg.obj + ,statbmpg.obj,splash.obj,collheaderctrlg.obj,graphicc.obj SOURCES = \ aboutdlgg.cpp,\ @@ -168,7 +168,7 @@ SOURCES = \ datavgen.cpp,dbgrptg.cpp,dragimgg.cpp,richmsgdlgg.cpp,\ commandlinkbuttong.cpp,spinctlg.cpp markuptext.cpp \ bannerwindow.cpp timectrlg.cpp richtooltipg.cpp statbmpg.cpp \ - textmeasure.cpp collheaderctrlg.cpp + textmeasure.cpp collheaderctrlg.cpp graphicc.cpp .ifdef __WXMOTIF__ OBJECTS0=statusbr.obj,statline.obj,notebook.obj,spinctlg.obj,collpaneg.obj,\ @@ -312,3 +312,4 @@ statbmpg.obj : statbmpg.cpp textmeasure.obj : textmeasure.cpp editlbox.obj : editlbox.cpp collheaderctrlg.obj : collheaderctrlg.cpp +graphicc.obj : graphicc.cpp