]> git.saurik.com Git - wxWidgets.git/blobdiff - src/motif/xmcombo/xmcombo.c
more non-const string literal warnings correction
[wxWidgets.git] / src / motif / xmcombo / xmcombo.c
index 6519996ac5c9de745054c68e2dde2be8f990c982..65223e4b11efa2fab6b43f57d39ab6c333874bbc 100644 (file)
  */
 #ifdef __VMS
 #include <wx/vms_x_fix.h>
+#undef XtDisplay
+#undef XtScreen
+#undef XtWindow
+#undef XtIsRealized
+#undef XtParent
+#undef XtClass
 #endif
 
 #include <X11/IntrinsicP.h>
 #include <Xm/TextF.h>
 #include <Xm/List.h>
 #include <Xm/LabelP.h>
+
+#if (XmVersion < 2000)
+
 #include <string.h>
 #include <ctype.h> /* define toupper */
 #include "combop.h"
@@ -3556,3 +3565,5 @@ Widget XmCreateComboBox(Widget parent, String name, ArgList arglist,
 } /* XmCreateComboBox */
 
 /* Ende von ComboBox.c */
+
+#endif /* XmVersion < 2000 */