Committing in .

 OpenVMS updates

 Modified Files:
 	wxWindows/setup.h_vms wxWindows/src/common/descrip.mms
 	wxWindows/src/motif/toplevel.cpp
 ----------------------------------------------------------------------

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

diff --git a/setup.h_vms b/setup.h_vms
index 60101dae627db3a44bff7c101c53245c2eb4d6e5..dc7aae8e990e1e1ba4ff87a7dd3fb0b54b8f833b 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -116,13 +116,21 @@
 #undef __WINDOWS__
 #endif
 
+#ifndef __WIN95__
 #undef __WIN95__
+#endif
 #ifndef __WIN32__
 #undef __WIN32__
 #endif
+#ifndef __GNUWIN32__
 #undef __GNUWIN32__
+#endif
+#ifndef STRICT
 #undef STRICT
+#endif
+#ifndef WINVER
 #undef WINVER
+#endif
 
 /* enable native status bar under Win32 */
 #if defined(__WIN95__) && !defined(__WXUNIVERSAL__)
@@ -768,11 +776,11 @@
 /*
  * Compatibility with 2.0 API.
  */
-#define WXWIN_COMPATIBILITY_2 0
+#define WXWIN_COMPATIBILITY_2 1
 /*
  * Compatibility with 2.2 API
  */
-#define WXWIN_COMPATIBILITY_2_2 0
+#define WXWIN_COMPATIBILITY_2_2 1
 /*
  * Compatibility with 2.4 API
  */
@@ -911,6 +919,9 @@
 /* The type of 3rd argument to getsockname() - usually size_t or int */
 #define SOCKLEN_T size_t
 
+/* The type of statvfs(2) argument */
+#undef WX_STATFS_T
+
 /* The signal handler prototype */
 #undef wxTYPE_SA_HANDLER
 

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index ff2d3245711371f5f3be4d684ed08b7a1b815c1a..68d8ee528a8debd3c85288eb0e161c24b3531ceb 100644 (file)
--- a/src/common/descrip.mms
+++ b/src/common/descrip.mms
@@ -167,11 +167,14 @@ OBJECTS2=utilscmn.obj,\
                zipstrm.obj,\
                zstream.obj
 
+OBJECTS_MOTIF=bmpbase.obj
+
 SOURCES = \
                parser.y,\
                appcmn.cpp,\
                artprov.cpp,\
                artstd.cpp,\
+               bmpbase.cpp,\
                choiccmn.cpp,\
                clipcmn.cpp,\
                clntdata.cpp,\
@@ -293,9 +296,11 @@ all : $(SOURCES)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS1)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS2)
 .ifdef __WXMOTIF__
+       $(MMS)$(MMSQUALIFIERS) $(OBJECTS_MOTIF)
        library [--.lib]libwx_motif.olb $(OBJECTS)
        library [--.lib]libwx_motif.olb $(OBJECTS1)
        library [--.lib]libwx_motif.olb $(OBJECTS2)
+       library [--.lib]libwx_motif.olb $(OBJECTS_MOTIF)
 .else
 .ifdef __WXGTK__
 .ifdef __WXUNIVERSAL__
@@ -332,6 +337,7 @@ lexer.c : lexer.l
 appcmn.obj : appcmn.cpp
 artprov.obj : artprov.cpp
 artstd.obj : artstd.cpp
+bmpbase.obj : bmpbase.cpp
 choiccmn.obj : choiccmn.cpp
 clipcmn.obj : clipcmn.cpp
 clntdata.obj : clntdata.cpp

diff --git a/src/motif/toplevel.cpp b/src/motif/toplevel.cpp
index 67ad48ed5d258bf561f7c31a46d6af68e638f5cf..6d1b385573c2aa5829bf09bce1951da83c748b77 100644 (file)
--- a/src/motif/toplevel.cpp
+++ b/src/motif/toplevel.cpp
@@ -25,7 +25,11 @@
 #include "wx/app.h"
 
 #ifdef __VMS__
-    #pragma message disable nosimpint
+#define XtDisplay XTDISPLAY
+#define XtParent XTPARENT
+#define XtScreen XTSCREEN
+#define XtWindow XTWINDOW
+#pragma message disable nosimpint
 #endif
 
 #include <Xm/Xm.h>