Committing in .

 Updates for OpenVMS

 Modified Files:
 	wxWidgets/src/motif/gauge.cpp
 	wxWidgets/src/motif/xmcombo/xmcombo.c
 ----------------------------------------------------------------------

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

diff --git a/src/motif/gauge.cpp b/src/motif/gauge.cpp
index 4ab115b8a6dc4e1d988f8d7f63c0b39c594c6d05..3cd261e8a17805aa4f65fff346c866b779825071 100644 (file)
--- a/src/motif/gauge.cpp
+++ b/src/motif/gauge.cpp
@@ -13,8 +13,13 @@
 #pragma implementation "gauge.h"
 #endif
 
-#ifdef __VMS__
+#ifdef __VMS
 #include <wx/vms_x_fix.h>
+#undef XtDisplay
+#undef XtScreen
+#undef XtWindow
+#undef XtIsRealized
+#undef XtParent
 #endif
 
 # include "wx/gauge.h"

diff --git a/src/motif/xmcombo/xmcombo.c b/src/motif/xmcombo/xmcombo.c
index 32f5686026cf10878650046e2b747a50dd9cc02e..601fe89c43e35b67e2255f9f9418db8b5c816aa3 100644 (file)
--- a/src/motif/xmcombo/xmcombo.c
+++ b/src/motif/xmcombo/xmcombo.c
@@ -93,6 +93,11 @@
  */
 #ifdef __VMS
 #include <wx/vms_x_fix.h>
+#undef XtDisplay
+#undef XtScreen
+#undef XtWindow
+#undef XtIsRealized
+#undef XtParent
 #endif
 
 #include <X11/IntrinsicP.h>