227. Add user_data field to Xaw's simpleWidgetClass (Bugzilla #1659,

      Alexander Pohoyda)
 226. Fix some X server man page typos (Bugzilla #1658, Nicolas Joly).

3 files changed, 24 insertions, 4 deletions

diff --git a/lib/Xaw/Simple.c b/lib/Xaw/Simple.c
index f4f484fcf..9e3f7cc09 100644
--- a/lib/Xaw/Simple.c
+++ b/lib/Xaw/Simple.c
@@ -45,7 +45,7 @@ SOFTWARE.
 
 ******************************************************************/
 
-/* $XFree86: xc/lib/Xaw/Simple.c,v 1.19 2006/01/25 04:32:09 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/Simple.c,v 1.20 2006/02/07 22:02:25 dawes Exp $ */
 
 #include <stdio.h>
 #include <X11/IntrinsicP.h>
@@ -183,6 +183,15 @@ static XtResource resources[] = {
     XtRImmediate,
     NULL
   },
+  {
+    XtNuserData,
+    XtCuserData,
+    XtRPointer,
+    sizeof(XtPointer),
+    offset(user_data),
+    XtRImmediate,
+    NULL
+  },
 #endif
 #undef offset
 };
diff --git a/lib/Xaw/Simple.h b/lib/Xaw/Simple.h
index c13f6cefb..112afa63d 100644
--- a/lib/Xaw/Simple.h
+++ b/lib/Xaw/Simple.h
@@ -44,7 +44,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xaw/Simple.h,v 1.10 2005/05/12 00:51:56 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/Simple.h,v 1.11 2006/01/25 04:32:09 dawes Exp $ */
 
 #ifndef _Simple_h
 #define _Simple_h
@@ -75,6 +75,7 @@ SOFTWARE.
  width		     Width		Dimension	0
  x		     Position		Position	0
  y		     Position		Position	0
+ userData	     UserData		Pointer		NULL
 
 */
 
@@ -111,6 +112,14 @@ SOFTWARE.
 #define XtNtip		"tip"
 #define XtCTip		"Tip"
 
+#ifndef XtNuserData
+#define XtNuserData	"userData"
+#endif
+
+#ifndef XtCuserData
+#define XtCuserData	"UserData"
+#endif
+
 #define XtNtipCallback	"tipCallback"
 #define XtCTipCallback	"Callback"
 
diff --git a/lib/Xaw/SimpleP.h b/lib/Xaw/SimpleP.h
index 400784b8f..758133f33 100644
--- a/lib/Xaw/SimpleP.h
+++ b/lib/Xaw/SimpleP.h
@@ -44,7 +44,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xaw/SimpleP.h,v 1.14 2005/05/12 00:51:56 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/SimpleP.h,v 1.15 2006/01/25 04:32:09 dawes Exp $ */
 
 #ifndef _SimpleP_h
 #define _SimpleP_h
@@ -87,7 +87,9 @@ typedef struct {
     String tip;
     XtCallbackList tipCallback;
     unsigned char encoding;
-    char pad[2 * sizeof(XtPointer) -    /* for future use and keep */
+    XtPointer user_data;
+
+    char pad[sizeof(XtPointer) -	/* for future use and keep */
 	     sizeof(unsigned char)];	/* binary compatability */
 #endif
 } SimplePart;