From cc57f388d769cba09debd611d1e5e5f6d28aee41 Mon Sep 17 00:00:00 2001 From: Jouk Jansen Date: Fri, 2 Jun 2006 06:39:13 +0000 Subject: [PATCH] Updated OpenVMS compile support git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- setup.h_vms | 10 +++++++++- src/common/descrip.mms | 20 ++++++++++++-------- src/gtk/slider.cpp | 5 +++++ 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/setup.h_vms b/setup.h_vms index 8982c22a7d..74fad9693f 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 : 19 May 2006 * + * Date : 2 June 2006 * * * *****************************************************************************/ @@ -85,6 +85,9 @@ /* Define this if your version of GTK+ is greater than 2.4 */ #define __WXGTK24__ 1 +/* Define this if your version of GTK+ is greater than 2.6 */ +#define __WXGTK26__ 1 + #include typedef pid_t GPid; @@ -318,10 +321,15 @@ typedef pid_t GPid; #define wxUSE_CHECKBOX 1 #define wxUSE_CHECKLISTBOX 1 #define wxUSE_CHOICE 1 +#define wxUSE_COLOURPICKERCTRL 1 #define wxUSE_COMBOBOX 1 #define wxUSE_DATAVIEWCTRL 1 #define wxUSE_DATEPICKCTRL 1 +#define wxUSE_DIRPICKERCTRL 1 +#define wxUSE_FILEPICKERCTRL 1 +#define wxUSE_FONTPICKERCTRL 1 #define wxUSE_GAUGE 1 +#define wxUSE_HYPERLINKCTRL 1 #define wxUSE_LISTBOX 1 #define wxUSE_LISTCTRL 1 #define wxUSE_RADIOBOX 1 diff --git a/src/common/descrip.mms b/src/common/descrip.mms index 9a91d40338..188a08022e 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 : 22 May 2006 * +# Date : 29 May 2006 * # * #***************************************************************************** .first @@ -98,12 +98,14 @@ OBJECTS = \ fldlgcmn.obj,\ fmapbase.obj,\ fontcmn.obj,\ + fontenumcmn.obj,\ fontmap.obj,\ framecmn.obj OBJECTS1=fs_inet.obj,\ fs_zip.obj,\ ftp.obj,\ + gaugecmn.obj,\ gdicmn.obj,\ gifdecod.obj,\ hash.obj,\ @@ -161,8 +163,9 @@ OBJECTS1=fs_inet.obj,\ strconv.obj,\ stream.obj,\ string.obj,\ - sysopt.obj,\ - tbarbase.obj,\ + sysopt.obj + +OBJECTS2=tbarbase.obj,\ textbuf.obj,\ textcmn.obj,\ textfile.obj,\ @@ -171,9 +174,8 @@ OBJECTS1=fs_inet.obj,\ toplvcmn.obj,\ treebase.obj,\ txtstrm.obj,\ - url.obj - -OBJECTS2=utilscmn.obj,\ + url.obj,\ + utilscmn.obj,\ rgncmn.obj,\ uri.obj,\ valgen.obj,\ @@ -187,10 +189,10 @@ OBJECTS2=utilscmn.obj,\ zipstrm.obj,\ zstream.obj -OBJECTS_MOTIF=gaugecmn.obj,radiocmn.obj +OBJECTS_MOTIF=radiocmn.obj OBJECTS_X11=accesscmn.obj,dndcmn.obj,dpycmn.obj,dseldlg.obj,\ - dynload.obj,effects.obj,fddlgcmn.obj,fs_mem.obj,gaugecmn.obj,\ + dynload.obj,effects.obj,fddlgcmn.obj,fs_mem.obj,\ gbsizer.obj,geometry.obj,matrix.obj,radiocmn.obj,\ regex.obj,taskbarcmn.obj,xti.obj,xtistrm.obj,xtixml.obj,\ combocmn.obj @@ -244,6 +246,7 @@ SOURCES = \ fldlgcmn.cpp,\ fmapbase.cpp,\ fontcmn.cpp,\ + fontenumcmn.cpp,\ fontmap.cpp,\ framecmn.cpp,\ fs_inet.cpp,\ @@ -428,6 +431,7 @@ filesys.obj : filesys.cpp fldlgcmn.obj : fldlgcmn.cpp fmapbase.obj : fmapbase.cpp fontcmn.obj : fontcmn.cpp +fontenumcmn.obj : fontenumcmn.cpp fontmap.obj : fontmap.cpp framecmn.obj : framecmn.cpp fs_inet.obj : fs_inet.cpp diff --git a/src/gtk/slider.cpp b/src/gtk/slider.cpp index f08fcc5b49..1d6870feca 100644 --- a/src/gtk/slider.cpp +++ b/src/gtk/slider.cpp @@ -12,6 +12,11 @@ #if wxUSE_SLIDER +#ifdef __VMS + //Missing definition in OpenVMS C++ header files. + double round(double __x); +#endif + #include "wx/slider.h" #ifndef WX_PRECOMP -- 2.47.2