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
This commit is contained in:
Jouk Jansen 2002-03-27 14:46:33 +00:00
parent b1c9fc705e
commit 130d96dcf6
3 changed files with 14 additions and 2 deletions

View File

@ -95,6 +95,7 @@ OBJECTS1=fs_inet.obj,\
hashmap.obj,\ hashmap.obj,\
helpbase.obj,\ helpbase.obj,\
http.obj,\ http.obj,\
iconbndl.obj,\
imagall.obj,\ imagall.obj,\
imagbmp.obj,\ imagbmp.obj,\
image.obj,\ image.obj,\
@ -213,6 +214,7 @@ SOURCES = \
hashmap.cpp,\ hashmap.cpp,\
helpbase.cpp,\ helpbase.cpp,\
http.cpp,\ http.cpp,\
iconbndl.cpp,\
imagall.cpp,\ imagall.cpp,\
imagbmp.cpp,\ imagbmp.cpp,\
image.cpp,\ image.cpp,\
@ -369,6 +371,7 @@ hash.obj : hash.cpp
hashmap.obj : hashmap.cpp hashmap.obj : hashmap.cpp
helpbase.obj : helpbase.cpp helpbase.obj : helpbase.cpp
http.obj : http.cpp http.obj : http.cpp
iconbndl.obj : iconbndl.cpp
imagall.obj : imagall.cpp imagall.obj : imagall.cpp
imagbmp.obj : imagbmp.cpp imagbmp.obj : imagbmp.cpp
image.obj : image.cpp image.obj : image.cpp

View File

@ -45,7 +45,8 @@ OBJECTS = \
gsocket.obj,\ gsocket.obj,\
mimetype.obj,\ mimetype.obj,\
threadpsx.obj,\ threadpsx.obj,\
utilsunx.obj utilsunx.obj,\
utilsx11.obj
SOURCES = \ SOURCES = \
dialup.cpp,\ dialup.cpp,\
@ -55,7 +56,8 @@ SOURCES = \
gsocket.c,\ gsocket.c,\
mimetype.cpp,\ mimetype.cpp,\
threadpsx.cpp,\ threadpsx.cpp,\
utilsunx.cpp utilsunx.cpp,\
utilsx11.cpp
all : $(SOURCES) all : $(SOURCES)
$(MMS)$(MMSQUALIFIERS) $(OBJECTS) $(MMS)$(MMSQUALIFIERS) $(OBJECTS)
@ -79,3 +81,4 @@ gsocket.obj : gsocket.c
mimetype.obj : mimetype.cpp mimetype.obj : mimetype.cpp
threadpsx.obj : threadpsx.cpp threadpsx.obj : threadpsx.cpp
utilsunx.obj : utilsunx.cpp utilsunx.obj : utilsunx.cpp
utilsx11.obj : utilsx11.cpp

View File

@ -16,8 +16,14 @@
#include "wx/image.h" #include "wx/image.h"
#include "wx/icon.h" #include "wx/icon.h"
#ifdef __VMS
#pragma message disable nosimpint
#endif
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xatom.h> #include <X11/Xatom.h>
#ifdef __VMS
#pragma message enable nosimpint
#endif
void wxSetIconsX11( WXDisplay* display, WXWindow window, void wxSetIconsX11( WXDisplay* display, WXWindow window,
const wxIconBundle& ib ) const wxIconBundle& ib )