From 52a15d5b9671ee73375243a29a3009fb20d8569f Mon Sep 17 00:00:00 2001
From: Jouk Jansen <joukj@hrem.nano.tudelft.nl>
Date: Thu, 25 Mar 2004 06:51:47 +0000
Subject: [PATCH]  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
---
 src/motif/gauge.cpp         | 7 ++++++-
 src/motif/xmcombo/xmcombo.c | 5 +++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/motif/gauge.cpp b/src/motif/gauge.cpp
index 4ab115b8a6..3cd261e8a1 100644
--- 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 32f5686026..601fe89c43 100644
--- 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>
-- 
2.45.2