Committing in .

 OpenVMS complie support

 Modified Files:
 	wxWindows/src/common/descrip.mms
 	wxWindows/src/unix/descrip.mms wxWindows/src/unix/utilsx11.cpp
 ----------------------------------------------------------------------

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

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index f462285d3789c726b735eb9e84aa41ae4788e59b..6e017756ee765bd8393fc2805a6e857b69382e90 100644 (file)
--- a/src/common/descrip.mms
+++ b/src/common/descrip.mms
@@ -95,6 +95,7 @@ OBJECTS1=fs_inet.obj,\
                hashmap.obj,\
                helpbase.obj,\
                http.obj,\
+               iconbndl.obj,\
                imagall.obj,\
                imagbmp.obj,\
                image.obj,\
@@ -213,6 +214,7 @@ SOURCES = \
                hashmap.cpp,\
                helpbase.cpp,\
                http.cpp,\
+               iconbndl.cpp,\
                imagall.cpp,\
                imagbmp.cpp,\
                image.cpp,\
@@ -369,6 +371,7 @@ hash.obj : hash.cpp
 hashmap.obj : hashmap.cpp
 helpbase.obj : helpbase.cpp
 http.obj : http.cpp
+iconbndl.obj : iconbndl.cpp
 imagall.obj : imagall.cpp
 imagbmp.obj : imagbmp.cpp
 image.obj : image.cpp

diff --git a/src/unix/descrip.mms b/src/unix/descrip.mms
index ffc126bfe110319a0f5e6588ac1ae2df451c5bc2..2b3d08c45291aa03ca67ce858536269bddfec736 100644 (file)
--- a/src/unix/descrip.mms
+++ b/src/unix/descrip.mms
@@ -45,7 +45,8 @@ OBJECTS = \
                gsocket.obj,\
                mimetype.obj,\
                threadpsx.obj,\
-               utilsunx.obj
+               utilsunx.obj,\
+               utilsx11.obj
 
 SOURCES = \
                dialup.cpp,\
@@ -55,7 +56,8 @@ SOURCES = \
                gsocket.c,\
                mimetype.cpp,\
                threadpsx.cpp,\
-               utilsunx.cpp
+               utilsunx.cpp,\
+               utilsx11.cpp
 
 all : $(SOURCES)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS)
@@ -79,3 +81,4 @@ gsocket.obj : gsocket.c
 mimetype.obj : mimetype.cpp
 threadpsx.obj : threadpsx.cpp
 utilsunx.obj : utilsunx.cpp
+utilsx11.obj : utilsx11.cpp

diff --git a/src/unix/utilsx11.cpp b/src/unix/utilsx11.cpp
index 44dcaeebe7051aa450692516613ee6b87b358af1..778447cea1ca661a325ad8572e41c8e05ffe364f 100644 (file)
--- a/src/unix/utilsx11.cpp
+++ b/src/unix/utilsx11.cpp
@@ -16,8 +16,14 @@
 #include "wx/image.h"
 #include "wx/icon.h"
 
+#ifdef __VMS
+#pragma message disable nosimpint
+#endif
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
+#ifdef __VMS
+#pragma message enable nosimpint
+#endif
 
 void wxSetIconsX11( WXDisplay* display, WXWindow window,
                     const wxIconBundle& ib )