cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switching on wxUSE_CAIRO for wxX11 on OpenVMS

Browse Source
This commit is contained in:
Jouk 2019-09-13 08:03:45 +02:00
parent dda6aa6bdc
commit 9a271ab676
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
setup.h_vms
View File

@ -3,7 +3,7 @@
* Template for the set.h file for VMS * * Template for the set.h file for VMS *
* Created from setup.h_in * * Created from setup.h_in *
* Author : J.Jansen (joukj@hrem.nano.tudelft.nl) * * Author : J.Jansen (joukj@hrem.nano.tudelft.nl) *
* Date : 31 January 2019 * * Date : 13 September 2019 *
* * * *
*****************************************************************************/ *****************************************************************************/
@ -109,7 +109,7 @@ typedef pid_t GPid;
#endif #endif
#endif #endif
#ifdef VMS_GTK2 #if defined( VMS_GTK2 ) || defined( __WXX11__ )
#define wxUSE_CAIRO 1 #define wxUSE_CAIRO 1
#else #else
#define wxUSE_CAIRO 0 #define wxUSE_CAIRO 0

5
src/common/cairo.cpp
View File

@ -395,7 +395,10 @@ bool wxCairoInit()
return wxCairo::Initialize(); return wxCairo::Initialize();
} }
#ifndef __WXGTK__ // the following code will not make sense on OpenVMS : dynamically loading
// of the cairo library is not possible, since on OpenVMS the library is
// created as a static library.
#if !( defined __WXGTK__ ) || defined( __VMS ) )
extern "C" extern "C"
{ {

4
src/common/descrip.mms
View File

@ -2,7 +2,7 @@
# * # *
# Make file for VMS * # Make file for VMS *
# Author : J.Jansen (joukj@hrem.nano.tudelft.nl) * # Author : J.Jansen (joukj@hrem.nano.tudelft.nl) *
# Date : 29 June 2017 * # Date : 13 September 2019 *
# * # *
#***************************************************************************** #*****************************************************************************
.first .first
@ -235,7 +235,7 @@ OBJECTS_X11=accesscmn.obj,dndcmn.obj,dpycmn.obj,dseldlg.obj,\
dynload.obj,effects.obj,fddlgcmn.obj,fs_mem.obj,\ dynload.obj,effects.obj,fddlgcmn.obj,fs_mem.obj,\
gbsizer.obj,geometry.obj,matrix.obj,radiocmn.obj,\ gbsizer.obj,geometry.obj,matrix.obj,radiocmn.obj,\
taskbarcmn.obj,xti.obj,xtistrm.obj,xtixml.obj,\ taskbarcmn.obj,xti.obj,xtistrm.obj,xtixml.obj,\
combocmn.obj combocmn.obj,cairo.obj
OBJECTS_GTK2=fontutilcmn.obj,cairo.obj OBJECTS_GTK2=fontutilcmn.obj,cairo.obj