Updated OpenVMS compile support

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

diff --git a/setup.h_vms b/setup.h_vms
index 8982c22a7d3d5b19f1c1155aa1a3671170ac0d26..74fad9693fd4222980af8e068c39ac6b4b1c08a3 100644 (file)
--- 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 <types.h>
 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 9a91d4033805348bab21d013fe00ce362dd89fb4..188a08022ed56196d363f54e75bcc7579868a1aa 100644 (file)
--- 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 f08fcc5b4905fdb2acdf7476b6d015f26a0ff087..1d6870feca4e4ca84d4d3fc0375aa5b44aa1f64d 100644 (file)
--- 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