Better fix

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

diff --git a/src/motif/xmcombo/xmcombo.c b/src/motif/xmcombo/xmcombo.c
index 21127c25a6cbfbca61a0f894dbb939a61ca941d3..be780d1fbc25a33bc621e4dcef6dde3b731e7140 100644 (file)
--- a/src/motif/xmcombo/xmcombo.c
+++ b/src/motif/xmcombo/xmcombo.c
@@ -91,12 +91,8 @@
  * Cambridge, MA 02139, USA.
  *
  */
  * Cambridge, MA 02139, USA.
  *
  */

-/* get XmVersion definition */
-#include <Xm/Xm.h>
-
-#if (XmVersion < 2000)
-

 #ifdef __VMS
 #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
 #include <wx/vms_x_fix.h>
 #undef XtDisplay
 #undef XtScreen


@@ -106,6 +102,11 @@
 #undef XtClass
 #endif
 
 #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>
 #include <X11/IntrinsicP.h>
 #include <X11/StringDefs.h>
 #include <X11/cursorfont.h>