[xorg-commit-diffs] xc/lib/Xaw Text.c, 1.1.4.5, 1.1.4.6 TextAction.c, 1.1.4.4, 1.1.4.5 Vendor.c, 1.1.4.2, 1.1.4.3 Xaw.man, 1.1.4.2, 1.1.4.3 XawInit.h, 1.1.4.2, 1.1.4.3

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/lib/Xaw
In directory pdx:/home/eich/tstbuild/xc/lib/Xaw

Modified Files:
      Tag: XORG-CURRENT
	Text.c TextAction.c Vendor.c Xaw.man XawInit.h 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


Index: Text.c
===================================================================
RCS file: /cvs/xorg/xc/lib/Xaw/Text.c,v
retrieving revision 1.1.4.5
retrieving revision 1.1.4.6
diff -u -d -r1.1.4.5 -r1.1.4.6
--- a/Text.c	5 Mar 2004 13:39:20 -0000	1.1.4.5
+++ b/Text.c	15 Apr 2004 10:14:58 -0000	1.1.4.6
@@ -2085,7 +2085,7 @@
 	    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);

Index: TextAction.c
===================================================================
RCS file: /cvs/xorg/xc/lib/Xaw/TextAction.c,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/TextAction.c	5 Mar 2004 13:39:20 -0000	1.1.4.4
+++ b/TextAction.c	15 Apr 2004 10:14:59 -0000	1.1.4.5
@@ -1099,7 +1099,7 @@
 	    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);

Index: Vendor.c
===================================================================
RCS file: /cvs/xorg/xc/lib/Xaw/Vendor.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/Vendor.c	5 Mar 2004 13:39:20 -0000	1.1.4.2
+++ b/Vendor.c	15 Apr 2004 10:14:59 -0000	1.1.4.3
@@ -111,11 +111,13 @@
  *
  ***************************************************************************/
 
-#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 @@
 		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 @@
     }
 }
 
-#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()

Index: Xaw.man
===================================================================
RCS file: /cvs/xorg/xc/lib/Xaw/Xaw.man,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/Xaw.man	5 Mar 2004 13:39:20 -0000	1.1.4.2
+++ b/Xaw.man	15 Apr 2004 10:14:59 -0000	1.1.4.3
@@ -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 @@
 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

Index: XawInit.h
===================================================================
RCS file: /cvs/xorg/xc/lib/Xaw/XawInit.h,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/XawInit.h	5 Mar 2004 13:39:20 -0000	1.1.4.2
+++ b/XawInit.h	15 Apr 2004 10:14:59 -0000	1.1.4.3
@@ -24,10 +24,11 @@
  */
 /* $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