Committing in .

 Small fixes for OpenVMS

 Modified Files:
 	wxWidgets/include/wx/vms_x_fix.h
 	wxWidgets/src/motif/xmcombo/xmcombo.c
: ----------------------------------------------------------------------

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35871 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/vms_x_fix.h b/include/wx/vms_x_fix.h
index 65a43fefad6086ff1b529fa0e618baed28daab8d..7abe9308169d31ed87dcfdfc240c0a3a3c2f448a 100644 (file)
--- a/include/wx/vms_x_fix.h
+++ b/include/wx/vms_x_fix.h
@@ -2,7 +2,7 @@
  *                                                                         *
  * Author : Jouk Jansen (joukj@hrem.stm.tudelft.nl)                        *
  *                                                                         *
  *                                                                         *
  * Author : Jouk Jansen (joukj@hrem.stm.tudelft.nl)                        *
  *                                                                         *

- * Last revision : 11 July 2005                                            *
+ * Last revision : 7 October 2005                                          *

  *                                                                         *
  * Repair definitions of Runtime library functions when compiling with     *
  * /name=(as_is) on OpenVMS                                                *
  *                                                                         *
  * Repair definitions of Runtime library functions when compiling with     *
  * /name=(as_is) on OpenVMS                                                *


@@ -390,6 +390,7 @@
 #define XextAddDisplay XEXTADDDISPLAY
 #define XextFindDisplay XEXTFINDDISPLAY
 #define XextRemoveDisplay XEXTREMOVEDISPLAY
 #define XextAddDisplay XEXTADDDISPLAY
 #define XextFindDisplay XEXTFINDDISPLAY
 #define XextRemoveDisplay XEXTREMOVEDISPLAY

+#define XkbSetDetectableAutoRepeat XKBSETDETECTABLEAUTOREPEAT

 #define XmActivateProtocol XMACTIVATEPROTOCOL
 #define XmAddProtocolCallback XMADDPROTOCOLCALLBACK
 #define XmAddProtocols XMADDPROTOCOLS
 #define XmActivateProtocol XMACTIVATEPROTOCOL
 #define XmAddProtocolCallback XMADDPROTOCOLCALLBACK
 #define XmAddProtocols XMADDPROTOCOLS


@@ -1192,12 +1193,14 @@
 #define xmToggleButtonGadgetClass XMTOGGLEBUTTONGADGETCLASS
 #define xmToggleButtonWidgetClass XMTOGGLEBUTTONWIDGETCLASS
 
 #define xmToggleButtonGadgetClass XMTOGGLEBUTTONGADGETCLASS
 #define xmToggleButtonWidgetClass XMTOGGLEBUTTONWIDGETCLASS
 

-#define SetReqLen(req,n,badlen) \
+#if (__VMS_VER < 80200000) 
+# define SetReqLen(req,n,badlen) \

     if ((req->length + n) > (unsigned)65535) { \
            n = badlen; \
            req->length += n; \
     } else \
        req->length += n
     if ((req->length + n) > (unsigned)65535) { \
            n = badlen; \
            req->length += n; \
     } else \
        req->length += n

+#endif

 
 #ifdef __cplusplus
 extern "C" {
 
 #ifdef __cplusplus
 extern "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>