Fix compiler warnings in the IE backend.

[wxWidgets.git] / src / motif / xmcombo / xmcombo.c

diff --git a/src/motif/xmcombo/xmcombo.c b/src/motif/xmcombo/xmcombo.c
index 6519996ac5c9de745054c68e2dde2be8f990c982..be780d1fbc25a33bc621e4dcef6dde3b731e7140 100644 (file)
--- a/src/motif/xmcombo/xmcombo.c
+++ b/src/motif/xmcombo/xmcombo.c
@@ -92,9 +92,21 @@
  *
  */
 #ifdef __VMS
+/* vms_x_fix.h should be included before any of the X11/Motif headers */
 #include <wx/vms_x_fix.h>
+#undef XtDisplay
+#undef XtScreen
+#undef XtWindow
+#undef XtIsRealized
+#undef XtParent
+#undef XtClass
 #endif
 
+/* get XmVersion definition */
+#include <Xm/Xm.h>
+
+#if (XmVersion < 2000)
+
 #include <X11/IntrinsicP.h>
 #include <X11/StringDefs.h>
 #include <X11/cursorfont.h>
@@ -112,6 +124,7 @@
 #include <Xm/TextF.h>
 #include <Xm/List.h>
 #include <Xm/LabelP.h>
+
 #include <string.h>
 #include <ctype.h> /* define toupper */
 #include "combop.h"
@@ -3556,3 +3569,5 @@ Widget XmCreateComboBox(Widget parent, String name, ArgList arglist,
 } /* XmCreateComboBox */
 
 /* Ende von ComboBox.c */
+
+#endif /* XmVersion < 2000 */