Path: utzoo!utgpu!utstat!jarvis.csri.toronto.edu!mailrus!nrl-cmf!ukma!xanth!lll-winken!ncis.llnl.gov!aftac.tis.llnl.gov!carlson
From: carlson@aftac.tis.llnl.gov (John Carlson)
Newsgroups: comp.windows.x
Subject: Re: Xhp widget fixes for R3 Xt Intrinsics
Message-ID: <64@ncis.llnl.gov>
Date: 10 Feb 89 13:46:38 GMT
References: <8902081425.AA06738@black-ice.tis.llnl.gov>
Sender: news@ncis.llnl.gov
Reply-To: carlson@aftac.tis.llnl.gov (John Carlson)
Organization: Lawrence Livermore National Laboratory, Livermore CA
Lines: 101

>Here are the changes I made to the HP widgets distributed with
>X.V11R3 to make the HP widgets work with Xt Intrinsics R3:

Here are some more patches to make the HP widgets distributed with R3
work with R3 Xt Intrinsics.

The first patch to Xw/SourceStr.c was made because I was getting name
conflicts between Xw and Xaw (Xaw may need to be patched too!).

The second patch is for Xw/WClassing.c.  I neglected to change this
previously because I was only trying to get the widgets to work with
XtCreateManagedWidget.

Good Luck!

John Carlson
carlson@tis.llnl.gov

*** XhpR2/Xw/SourceStr.c	Fri Sep 16 10:04:01 1988
--- Xhp/Xw/SourceStr.c	Wed Feb  8 13:36:43 1989
***************
*** 75,81 ****
  };
  
  /*--------------------------------------------------------------------------+*/
! unsigned char Look(data, position, direction)
  /*--------------------------------------------------------------------------+*/
    StringSourcePtr data;
    XwTextPosition  position;
--- 75,81 ----
  };
  
  /*--------------------------------------------------------------------------+*/
! static unsigned char Look(data, position, direction)
  /*--------------------------------------------------------------------------+*/
    StringSourcePtr data;
    XwTextPosition  position;
*** XhpR2/Xw/WClassing.c	Fri Sep 16 10:05:30 1988
--- Xhp/Xw/WClassing.c	Fri Feb 10 03:22:01 1989
***************
*** 38,44 ****
  
  #undef XtCreateWidget
  
- extern XrmDatabase	XtDefaultDB;
  extern XwWCViewLoadProc	XwWCViewLoadProcs[];
  extern int	XwNumWCViewLoadProcs;
  extern XwTaskTableEntry	XwTasks[];
--- 38,43 ----
***************
*** 163,169 ****
  
  	/*
  	 * Set up the resource lists.  First, traverse the widget 
! 	 * heirarchy and get names and classes.
  	 */
  	for(length = 0; w != NULL; w = w->core.parent, length++)
  	{
--- 162,168 ----
  
  	/*
  	 * Set up the resource lists.  First, traverse the widget 
! 	 * hierarchy and get names and classes.
  	 */
  	for(length = 0; w != NULL; w = w->core.parent, length++)
  	{
***************
*** 173,179 ****
  	}
  
  	/*
! 	 * Because the heirarchy was traversed bottom-up, the
  	 * lists are backwards from what we need.  Invert them.
  	 */
  	for (i = 0; i < length/2; i++)
--- 172,178 ----
  	}
  
  	/*
! 	 * Because the hierarchy was traversed bottom-up, the
  	 * lists are backwards from what we need.  Invert them.
  	 */
  	for (i = 0; i < length/2; i++)
***************
*** 205,211 ****
  	/*
  	 * Get the resource.
  	 */
! 	if (XrmQGetResource(XtDefaultDB,names,classes,&typeQ,&res_ret))
  	{
  		/*
  		 * See if we can get a match with an entry in the
--- 204,211 ----
  	/*
  	 * Get the resource.
  	 */
! 	if (XrmQGetResource(XtDatabase(XtDisplay(parent)),
! 		names,classes,&typeQ,&res_ret))
  	{
  		/*
  		 * See if we can get a match with an entry in the