X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..64ea838d8f4d1853b7d850db93ee565e901d099a:/src/motif/xmcombo/xmcombo.c diff --git a/src/motif/xmcombo/xmcombo.c b/src/motif/xmcombo/xmcombo.c index 6519996ac5..be780d1fbc 100644 --- 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 +#undef XtDisplay +#undef XtScreen +#undef XtWindow +#undef XtIsRealized +#undef XtParent +#undef XtClass #endif +/* get XmVersion definition */ +#include + +#if (XmVersion < 2000) + #include #include #include @@ -112,6 +124,7 @@ #include #include #include + #include #include /* 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 */