diff options
| -rw-r--r-- | include/X11/Xaw/XawInit.h | 3 | ||||
| -rw-r--r-- | man/Xaw.man | 12 | ||||
| -rw-r--r-- | src/Text.c | 2 | ||||
| -rw-r--r-- | src/TextAction.c | 2 | ||||
| -rw-r--r-- | src/Vendor.c | 25 |
5 files changed, 34 insertions, 10 deletions
diff --git a/include/X11/Xaw/XawInit.h b/include/X11/Xaw/XawInit.h index da9d446..2e178eb 100644 --- a/include/X11/Xaw/XawInit.h +++ b/include/X11/Xaw/XawInit.h @@ -24,10 +24,11 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/Xaw/XawInit.h,v 1.12 2001/01/17 19:42:36 dawes Exp $ */ +/* $XdotOrg$ */ #ifndef _XawInit_h #define _XawInit_h -#define XawVendor "XFree86" +#define XawVendor XVENDORNAMESHORT #ifdef OLDXAW #define XawVersion 6700002L diff --git a/man/Xaw.man b/man/Xaw.man index a96b25a..8803f10 100644 --- a/man/Xaw.man +++ b/man/Xaw.man @@ -24,7 +24,7 @@ .\" dealings in this Software without prior written authorization from the .\" XFree86 Project. .\" -.\" Author: Paulo César Pereira de Andrade +.\" Author: Paulo César Pereira de Andrade .\" .\" $XFree86: xc/lib/Xaw/Xaw.man,v 1.7 2001/11/04 21:16:39 paulo Exp $ .\" @@ -39,9 +39,10 @@ .SH DESCRIPTION .B Xaw is a widget set based on the X Toolkit Intrinsics (Xt) Library. This -manual page describes the additions and modifications to the Xaw library -made by XFree86 (Xaw7), as well as some of the common interfaces between -its version and the previous X Consortium release (Xaw6). +release by the X.org Foundation includes additions and modifications +originally made for The XFree86 Project, Inc. This manual page describes +these changes as well as some of the common interfaces between its version +and the previous X Consortium release (Xaw6). .SH ACTIONS All of the \fIXaw\fR widgets now have the additional translations .B call-proc, declare, get-values @@ -580,7 +581,8 @@ Guarino-Reid, Charles Haynes, Rich Hyde, Mary Larson, Joel McCormack, Ron Newman, Jeanne Rich, Terry Weissman, Mike Gancarz, Phil Karlton, Kathleen Langone, Ram Rao, Smokey Wallace, Al Mento, and Jean Diaz. .PP -XFree86's additions and modifications to \fIXaw\fR were written by Paulo +The additions and modifications to \fIXaw\fR which were +originally made for XFree86 were written by Paulo C\('esar Pereira de Andrade. .SH SEE ALSO .I Athena Widget Set - C Language Interface @@ -2085,7 +2085,7 @@ TextConvertSelection(Widget w, Atom *selection, Atom *target, Atom *type, textprop.value = (unsigned char *)*value; textprop.nitems = strlen(*value); textprop.format = 8; - if (XFree86utf8TextPropertyToTextList(d, &textprop, &list, &count) + if (Xutf8TextPropertyToTextList(d, &textprop, &list, &count) < Success || count < 1) { XtFree((char *)*value); diff --git a/src/TextAction.c b/src/TextAction.c index 69072e8..dc6d81d 100644 --- a/src/TextAction.c +++ b/src/TextAction.c @@ -1099,7 +1099,7 @@ ConvertSelection(Widget w, Atom *selection, Atom *target, Atom *type, textprop.value = (unsigned char *)*value; textprop.nitems = strlen(*value); textprop.format = 8; - if (XFree86utf8TextPropertyToTextList(d, &textprop, &list, &count) + if (Xutf8TextPropertyToTextList(d, &textprop, &list, &count) < Success || count < 1) { XtFree(*value); diff --git a/src/Vendor.c b/src/Vendor.c index 83313b6..7012f52 100644 --- a/src/Vendor.c +++ b/src/Vendor.c @@ -111,11 +111,13 @@ static XtResource resources[] = { * ***************************************************************************/ -#ifdef __UNIXOS2__ +#if defined(__UNIXOS2__) || defined(__CYGWIN__) /* to fix the EditRes problem because of wrong linker semantics */ extern WidgetClass vendorShellWidgetClass; /* from Xt/Vendor.c */ extern VendorShellClassRec _XawVendorShellClassRec; extern void _XawFixupVendorShell(); + +#if defined(__UNIXOS2__) unsigned long _DLL_InitTerm(unsigned long mod,unsigned long flag) { switch (flag) { @@ -130,6 +132,25 @@ unsigned long _DLL_InitTerm(unsigned long mod,unsigned long flag) return 0; } } +#endif + +#if defined(__CYGWIN__) +int __stdcall +DllMain(unsigned long mod_handle, unsigned long flag, void *routine) +{ + switch (flag) + { + case 1: /* DLL_PROCESS_ATTACH - process attach */ + vendorShellWidgetClass = (WidgetClass)(&_XawVendorShellClassRec); + _XawFixupVendorShell(); + break; + case 0: /* DLL_PROCESS_DETACH - process detach */ + break; + } + return 1; +} +#endif + #define vendorShellClassRec _XawVendorShellClassRec #endif @@ -337,7 +358,7 @@ XawVendorShellClassPartInit(WidgetClass cclass) } } -#if defined(__osf__) || defined(__UNIXOS2__) +#if defined(__osf__) || defined(__UNIXOS2__) || defined(__CYGWIN__) /* stupid OSF/1 shared libraries have the wrong semantics */ /* symbols do not get resolved external to the shared library */ void _XawFixupVendorShell() |