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
2004-03-25 06:51:47 +00:00
parent 9472490a67
commit 52a15d5b96
2 changed files with 11 additions and 1 deletions
--- 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"
--- 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>