Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Committing in .

Browse Source 
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
This commit is contained in:
Jouk Jansen
2005-10-10 14:18:40 +00:00
parent 583d6b4bd2
commit 21a186a1fc
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/vms_x_fix.h
View File

@@ -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 * * Repair definitions of Runtime library functions when compiling with *
* /name=(as_is) on OpenVMS * * /name=(as_is) on OpenVMS *
@@ -390,6 +390,7 @@
#define XextAddDisplay XEXTADDDISPLAY #define XextAddDisplay XEXTADDDISPLAY
#define XextFindDisplay XEXTFINDDISPLAY #define XextFindDisplay XEXTFINDDISPLAY
#define XextRemoveDisplay XEXTREMOVEDISPLAY #define XextRemoveDisplay XEXTREMOVEDISPLAY
#define XkbSetDetectableAutoRepeat XKBSETDETECTABLEAUTOREPEAT
#define XmActivateProtocol XMACTIVATEPROTOCOL #define XmActivateProtocol XMACTIVATEPROTOCOL
#define XmAddProtocolCallback XMADDPROTOCOLCALLBACK #define XmAddProtocolCallback XMADDPROTOCOLCALLBACK
#define XmAddProtocols XMADDPROTOCOLS #define XmAddProtocols XMADDPROTOCOLS
@@ -1192,12 +1193,14 @@
#define xmToggleButtonGadgetClass XMTOGGLEBUTTONGADGETCLASS #define xmToggleButtonGadgetClass XMTOGGLEBUTTONGADGETCLASS
#define xmToggleButtonWidgetClass XMTOGGLEBUTTONWIDGETCLASS #define xmToggleButtonWidgetClass XMTOGGLEBUTTONWIDGETCLASS
#if (__VMS_VER < 80200000)
# define SetReqLen(req,n,badlen) \ # define SetReqLen(req,n,badlen) \
if ((req->length + n) > (unsigned)65535) { \ if ((req->length + n) > (unsigned)65535) { \
n = badlen; \ n = badlen; \
req->length += n; \ req->length += n; \
} else \ } else \
req->length += n req->length += n
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

11
src/motif/xmcombo/xmcombo.c
View File

@@ -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> #include <wx/vms_x_fix.h>
#undef XtDisplay #undef XtDisplay
#undef XtScreen #undef XtScreen
@@ -106,6 +102,11 @@
#undef XtClass #undef XtClass
#endif #endif
/* get XmVersion definition */
#include <Xm/Xm.h>
#if (XmVersion < 2000)
#include <X11/IntrinsicP.h> #include <X11/IntrinsicP.h>
#include <X11/StringDefs.h> #include <X11/StringDefs.h>
#include <X11/cursorfont.h> #include <X11/cursorfont.h>