X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/52a15d5b9671ee73375243a29a3009fb20d8569f..386a2898e3a55362d30d22adf024b95ce0d5773f:/src/motif/xmcombo/xmcombo.c diff --git a/src/motif/xmcombo/xmcombo.c b/src/motif/xmcombo/xmcombo.c index 601fe89c43..be780d1fbc 100644 --- a/src/motif/xmcombo/xmcombo.c +++ b/src/motif/xmcombo/xmcombo.c @@ -92,14 +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> @@ -118,8 +125,6 @@ #include <Xm/List.h> #include <Xm/LabelP.h> -#if (XmVersion < 2000) - #include <string.h> #include <ctype.h> /* define toupper */ #include "combop.h"