*** _xc/programs/beforelight/B4light.ad	Tue Jun 28 21:31:16 1994
--- xc/programs/beforelight/B4light.ad	Sun Jul 29 04:45:24 2001
***************
*** 1 ****
--- 1,2 ----
  *label.label: Before Light - Keith's hack...
+ *shadowWidth: 0
*** _xc/programs/bitmap/Bitmap.ad	Thu Jan 18 08:44:50 2001
--- xc/programs/bitmap/Bitmap.ad	Sun Jul 29 04:30:12 2001
***************
*** 2,8 ****
  ! The App-defaults file for Bitmap.
  
  *TransientShell.allowShellResize:	True
! *shapeStyle:				oval
  *cursor:				left_ptr
  *pane.orientation:			horizontal
  
--- 2,8 ----
  ! The App-defaults file for Bitmap.
  
  *TransientShell.allowShellResize:	True
! !*shapeStyle:				oval
  *cursor:				left_ptr
  *pane.orientation:			horizontal
  
***************
*** 226,229 ****
--- 226,240 ----
  *form.undo.fromVert:			clearHotSpot
  *form.undo.label:			Undo
  
+ *font:	-adobe-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1
  
+ *background:	#c0c0c0
+ *borderColor:	#6f6f6f
+ *Viewport*background:	#ffffff
+ *Text*background:	#e7e7e7
+ *Text*TransientShell*Form.background:	#c0c0c0
+ *Text*TransientShell*Form*Label.background:	#c0c0c0
+ *Text*TransientShell*Form*Toggle.background:	#c0c0c0
+ *Text*TransientShell*Form*Command.background:	#c0c0c0
+ *pane*bitmap*background:	#e7e7e7
+ *Grip*foreground:	#c0c0c0
*** _xc/programs/editres/Editres.ad	Thu Jan 18 08:44:52 2001
--- xc/programs/editres/Editres.ad	Sun Jul 29 04:30:55 2001
***************
*** 9,15 ****
  
  Editres.Geometry:			500x568
  
! *ShapeStyle:				Oval
  *Tree*ShapeStyle:			Rectangle
  
  ! The rest of this file are either button names, or important for
--- 9,15 ----
  
  Editres.Geometry:			500x568
  
! !*ShapeStyle:				Oval
  *Tree*ShapeStyle:			Rectangle
  
  ! The rest of this file are either button names, or important for
***************
*** 281,283 ****
--- 281,296 ----
  *tree*TransientShell.translations: #override \
  <Map>:	get-values(1, $w, width) \
  	set-values(1, maxWidth, $w)
+ 
+ *font:	-adobe-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1
+ 
+ *background:	#c0c0c0
+ *borderColor:	#6f6f6f
+ *Viewport*background:	#ffffff
+ *porthole*background:	#e7e7e7
+ *Text*background:	#e7e7e7
+ *Text*TransientShell*Form.background:	#c0c0c0
+ *Text*TransientShell*Form*Label.background:	#c0c0c0
+ *Text*TransientShell*Form*Toggle.background:	#c0c0c0
+ *Text*TransientShell*Form*Command.background:	#c0c0c0
+ *Grip*foreground:	#c0c0c0
*** _xc/programs/viewres/Viewres.ad	Sun Feb 13 12:26:16 2000
--- xc/programs/viewres/Viewres.ad	Sun Jul 29 03:28:58 2001
***************
*** 1,7 ****
  *Panner*backgroundStipple: grid2
  
  *allowShellResize: true
! *buttonbox*ShapeStyle: oval
  *Form*Panner.Thickness: -1
  *Form.defaultDistance: 0
  *Form.BorderWidth: 0
--- 1,7 ----
  *Panner*backgroundStipple: grid2
  
  *allowShellResize: true
! !*buttonbox*ShapeStyle: oval
  *Form*Panner.Thickness: -1
  *Form.defaultDistance: 0
  *Form.BorderWidth: 0
***************
*** 26,32 ****
  *Tree*List*Font: -adobe-helvetica-medium-r-normal--*-80-*-*-*-*-iso*-*
  
  *SimpleMenu*BackingStore: NotUseful
! *Font: -adobe-helvetica-bold-r-normal--*-120-*-*-*-*-iso*-*
  *buttonbox.MenuButton.leftBitmap: menu12
  *SimpleMenu*menuLabel.vertSpace:   100
  *SimpleMenu*SmeLine*Height: 12
--- 26,33 ----
  *Tree*List*Font: -adobe-helvetica-medium-r-normal--*-80-*-*-*-*-iso*-*
  
  *SimpleMenu*BackingStore: NotUseful
! !*Font: -adobe-helvetica-bold-r-normal--*-120-*-*-*-*-iso*-*
! *Font: -adobe-helvetica-medium-r-normal--12-*-*-*-*-*-iso*-*
  *buttonbox.MenuButton.leftBitmap: menu12
  *SimpleMenu*menuLabel.vertSpace:   100
  *SimpleMenu*SmeLine*Height: 12
***************
*** 93,95 ****
--- 94,100 ----
  *buttonbox.select.selectMenu.selectDescendants.Label: Select Descendants
  *buttonbox.select.selectMenu.selectHasResources.Label: Select Has Resources
  *buttonbox.select.selectMenu.selectShownResources.Label: Select Shown Resource Boxes
+ *background:	#c0c0c0
+ *borderColor:	#6f6f6f
+ *Porthole*background:	#e7e7e7
+ *Grip*foreground:	#c0c0c0
*** _xc/programs/xcalc/XCalc.ad	Sun Feb 13 12:26:18 2000
--- xc/programs/xcalc/XCalc.ad	Sun Jul 29 03:35:39 2001
***************
*** 7,13 ****
  
  XCalc*Cursor:		hand2
  XCalc*Font:		8x13
! XCalc*ShapeStyle:	rectangle
  XCalc*Command.horizDistance:	2
  XCalc*Command.vertDistance:	2
  XCalc*Command.width:		40
--- 7,13 ----
  
  XCalc*Cursor:		hand2
  XCalc*Font:		8x13
! !XCalc*ShapeStyle:	rectangle
  XCalc*Command.horizDistance:	2
  XCalc*Command.vertDistance:	2
  XCalc*Command.width:		40
***************
*** 526,528 ****
--- 526,535 ----
  XCalc*hp.button38.fromVert:		button29
  XCalc*hp.button39.fromHoriz:		button38
  XCalc*hp.button39.fromVert:		button30
+ 
+ *ti.bevel.background:      #6f6f6f
+ *ti.bevel.screen*background:      #e7e7e7
+ *background:	#c0c0c0
+ *borderColor:	#6f6f6f
+ *bevel*shadowWidth: 0
+ *Grip*foreground:	#c0c0c0
*** _xc/programs/xclipboard/XClipboard.ad	Wed Jan 17 07:47:44 2001
--- xc/programs/xclipboard/XClipboard.ad	Sun Jul 29 03:37:32 2001
***************
*** 1,7 ****
  ! $Xorg: XClipboard.ad,v 1.3 2000/08/17 19:54:12 cpqbld Exp $
! *Command*Font: 	-*-helvetica-bold-r-normal--*-120-*-*-*-*-iso8859-1
! *Label*Font: 	-*-helvetica-bold-r-normal--*-120-*-*-*-*-iso8859-1
! *Text*Font:	-*-courier-medium-r-normal--*-120-*-*-*-*-iso8859-1
  
  *quit.label: 			Quit
  *quit.top: 			ChainTop
--- 1,9 ----
  ! $Xorg: XClipboard.ad,v 1.3 2000/08/17 19:54:12 cpqbld Exp $
! !*Command*Font: 	-*-helvetica-bold-r-normal--*-120-*-*-*-*-iso8859-1
! !*Label*Font: 	-*-helvetica-bold-r-normal--*-120-*-*-*-*-iso8859-1
! *Command*Font:	-adobe-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1
! *Text*Font:	-*-courier-medium-r-normal--12-*-*-*-*-*-iso8859-1
+ *Font:	-adobe-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1
  
  *quit.label: 			Quit
  *quit.top: 			ChainTop
***************
*** 76,82 ****
  *text.width:			300
  
  XClipboard.geometry:		300x200
! *ShapeStyle:			oval
  XClipboard.baseTranslations: #augment\n\
  			<Message>WM_PROTOCOLS: WMProtocols()\n
  *TransientShell.baseTranslations: #augment\n\
--- 78,84 ----
  *text.width:			300
  
  XClipboard.geometry:		300x200
! !*ShapeStyle:			oval
  XClipboard.baseTranslations: #augment\n\
  			<Message>WM_PROTOCOLS: WMProtocols()\n
  *TransientShell.baseTranslations: #augment\n\
***************
*** 124,126 ****
--- 126,139 ----
  			Ctrl<Key>M: no-op(ring-bell) \n\
  			Ctrl<Key>J: no-op(ring-bell) \n\
  			Meta<Key>I: no-op(ring-bell)
+ 
+ *background:	#c0c0c0
+ *borderColor:	#6f6f6f
+ *Text*background:	#e7e7e7
+ *Text*Scrollbar*background:	#c0c0c0
+ *Text*TransientShell*Form.background:	#c0c0c0
+ *Text*TransientShell*Form*Label.background:	#c0c0c0
+ *Text*TransientShell*Form*Toggle.background:	#c0c0c0
+ *Text*TransientShell*Form*Command.background:	#c0c0c0
+ *Text*TransientShell*font:	-adobe-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1
+ *Grip*foreground:	#c0c0c0
*** _xc/programs/xclock/XClock.ad	Wed Apr 27 16:12:44 1994
--- xc/programs/xclock/XClock.ad	Sun Jul 29 04:52:40 2001
***************
*** 1 ****
--- 1,2 ----
  XClock.input: false
+ *shadowWidth: 0
*** _xc/programs/xconsole/XConsole.ad	Thu Jan 18 08:45:19 2001
--- xc/programs/xconsole/XConsole.ad	Sun Jul 29 04:53:28 2001
***************
*** 26,28 ****
--- 26,30 ----
  *text.height:			70
  *text.allowResize:		true
  *editType:			read
+ 
+ *shadowWidth: 0
*** _xc/programs/xditview/Xditview.ad	Thu Feb 24 05:35:30 2000
--- xc/programs/xditview/Xditview.ad	Sun Jul 29 03:39:16 2001
***************
*** 1,7 ****
  Xditview.geometry: 600x800
! *MenuButton*Font: 	-*-helvetica-bold-r-normal--*-120-*-*-*-*-iso8859-1
! *SimpleMenu*Font: 	-*-helvetica-bold-r-normal--*-120-*-*-*-*-iso8859-1
! *Text*Font:	-*-courier-medium-r-normal--*-120-*-*-*-*-iso8859-1
  
  *paned.allowResize:		true
  *paned.?.showGrip:		false
--- 1,7 ----
  Xditview.geometry: 600x800
! !*MenuButton*Font: 	-*-helvetica-bold-r-normal--*-120-*-*-*-*-iso8859-1
! !*SimpleMenu*Font: 	-*-helvetica-bold-r-normal--*-120-*-*-*-*-iso8859-1
! *Text*Font:	-*-courier-medium-r-normal--12-*-*-*-*-*-iso8859-1
  
  *paned.allowResize:		true
  *paned.?.showGrip:		false
***************
*** 10,17 ****
  *paned.form.porthole.height:	800
  *paned.label.skipAdjust:	true
  
! *MenuButton.shapeStyle: oval
! *Command.shapeStyle: oval
  
  *fileMenuButton.label:		File
  *fileMenuButton.leftBitmap:	menu12
--- 10,17 ----
  *paned.form.porthole.height:	800
  *paned.label.skipAdjust:	true
  
! !*MenuButton.shapeStyle: oval
! !*Command.shapeStyle: oval
  
  *fileMenuButton.label:		File
  *fileMenuButton.leftBitmap:	menu12
***************
*** 94,96 ****
--- 94,108 ----
  	<BtnUp>: Cancel() unset()
  *promptShell.promptDialog.cancel.baseTranslations: #override \
  	<BtnUp>: Cancel() unset()
+ 
+ *Font:	-adobe-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1
+ *background:	#c0c0c0
+ *borderColor:	#6f6f6f
+ *Text*background:	#e7e7e7
+ *Text*TransientShell*Form.background:	#c0c0c0
+ *Text*TransientShell*Form*Label.background:	#c0c0c0
+ *Text*TransientShell*Form*Toggle.background:	#c0c0c0
+ *Text*TransientShell*Form*Command.background:	#c0c0c0
+ *Text*TransientShell*font:	-adobe-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1
+ *Viewport*background:	#ffffff
+ *Viewport*Scrollbar*background:	#c0c0c0
*** _xc/programs/xdm/Chooser.ad	Fri Apr  6 11:16:25 2001
--- xc/programs/xdm/Chooser.ad	Sun Jul 29 04:17:32 2001
***************
*** 1,6 ****
  ! $XFree86: xc/programs/xdm/Chooser.ad,v 1.2 2001/04/06 02:16:25 dawes Exp $
  !
! *ShapeStyle:		Oval
  *cursor:		left_ptr
  *allowShellResize:	true
  *label.label:		XDMCP Host Menu
--- 1,6 ----
  ! $XFree86: xc/programs/xdm/Chooser.ad,v 1.2 2001/04/06 02:16:25 dawes Exp $
  !
! !*ShapeStyle:		Oval
  *cursor:		left_ptr
  *allowShellResize:	true
  *label.label:		XDMCP Host Menu
***************
*** 44,46 ****
--- 44,54 ----
  	<BtnUp>:		Accept() unset()
  *ping.translations:	#override \
  	<BtnUp>:		Ping() unset()
+ 
+ *beNiceToColormap:	False
+ *Background:	#c0c0c0
+ *Viewport*Background:	#e7e7e7
+ *Viewport*Scrollbar*Background:	#c0c0c0
+ *Foreground:	#000000
+ *borderColor:	#6f6f6f
+ *Grip*foreground:	#c0c0c0
*** _xc/programs/xedit/Xedit.ad	Tue Feb  6 07:38:04 2001
--- xc/programs/xedit/Xedit.ad	Sun Jul 29 03:45:30 2001
***************
*** 463,465 ****
--- 463,486 ----
  
  *columns.translations:	#override \
  <Message>WM_PROTOCOLS:	set-columns(cancel)
+ 
+ *buttons*font:	-adobe-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1
+ *messageWindow*font:	-adobe-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1
+ *Label*font:	-adobe-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1
+ *TransientShell*font:	-adobe-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1
+ *Text*background:	#e7e7e7
+ *Text*Scrollbar*background:	#c0c0c0
+ *Text*TransientShell*Form.background:	#c0c0c0
+ *Text*TransientShell*Form*Label.background:	#c0c0c0
+ *Text*TransientShell*Form*Toggle.background:	#c0c0c0
+ *Text*TransientShell*Form*Command.background:	#c0c0c0
+ *background:	#c0c0c0
+ *borderColor:	#6f6f6f
+ *Grip*foreground:	#c0c0c0
+ *editWindow*background:	#ffffff
+ *editWindow*Scrollbar*background:	#c0c0c0
+ *editWindow*TransientShell*background:	#e7e7e7
+ *editWindow*TransientShell*Form.background:	#c0c0c0
+ *editWindow*TransientShell*Form*Label.background:	#c0c0c0
+ *editWindow*TransientShell*Form*Toggle.background:	#c0c0c0
+ *editWindow*TransientShell*Form*Command.background:	#c0c0c0
*** _xc/programs/xfd/Xfd.ad	Wed Jan 17 07:49:31 2001
--- xc/programs/xfd/Xfd.ad	Sun Jul 29 03:46:44 2001
***************
*** 27,29 ****
--- 27,34 ----
  Ctrl <Key>n: Next()\n\
  Ctrl <Key>p: Prev()
  
+ *font:	-adobe-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1
+ *background:	#c0c0c0
+ *borderColor:	#6f6f6f
+ *Form*background:	#e7e7e7
+ *Grip*foreground:	#c0c0c0
*** _xc/programs/xfontsel/XFontSel.ad	Sun Feb 13 12:26:24 2000
--- xc/programs/xfontsel/XFontSel.ad	Sun Jul 29 03:55:20 2001
***************
*** 109,114 ****
--- 109,115 ----
  
  !*fieldBox*field11.Sensitive: False
  *fieldBox*field11.menu.Options.ShowUnselectable: False
+ *fieldBox*field11.menu*font: -misc-fixed-medium-r-normal--7-*-*-*-c-50-iso8859-1
  
  
  !*field1*menu*courier.Font:
***************
*** 144,146 ****
--- 145,156 ----
  
  *sampleText*allowResize: true
  *sampleText*Height:	 50
+ 
+ *commandBox*font:	-adobe-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1
+ *fieldBox*font:	7x14
+ *fontName*font:	7x14
+ *background:	#c0c0c0
+ *borderColor:	#6f6f6f
+ *fontName*background:	#e7e7e7
+ *Viewport*background:	#ffffff
+ *Grip*foreground:	#c0c0c0
*** _xc/programs/xgc/Xgc.ad	Sun Feb 13 12:26:26 2000
--- xc/programs/xgc/Xgc.ad	Sun Jul 29 03:57:09 2001
***************
*** 1,2 ****
--- 1,12 ----
  *planemask*ShapeStyle: rectangle
  *dashlist*ShapeStyle: rectangle
+ *font:	-adobe-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1
+ Xgc.background:    #ffffff
+ *background:    #c0c0c0
+ *borderColor:   #6f6f6f
+ *Text*background:       #e7e7e7
+ *Text*TransientShell*Form.background:	#c0c0c0
+ *Text*TransientShell*Form*Label.background:	#c0c0c0
+ *Text*TransientShell*Form*Toggle.background:	#c0c0c0
+ *Text*TransientShell*Form*Command.background:	#c0c0c0
+ *Grip*foreground:	#c0c0c0
*** _xc/programs/xload/XLoad.ad	Sun Feb 13 12:26:31 2000
--- xc/programs/xload/XLoad.ad	Sun Jul 29 05:01:20 2001
***************
*** 4,6 ****
--- 4,7 ----
  *internalBorderWidth:		0
  *showGrip:			FALSE
  
+ *shadowWidth: 0
*** _xc/programs/xlogo/XLogo.ad	Wed Apr 27 16:12:55 1994
--- xc/programs/xlogo/XLogo.ad	Sun Jul 29 05:01:48 2001
***************
*** 1 ****
--- 1,2 ----
  XLogo.input: false
+ *shadowWidth: 0
*** _xc/programs/xmh/Xmh.ad	Wed Apr 27 16:12:50 1994
--- xc/programs/xmh/Xmh.ad	Sun Jul 29 04:05:17 2001
***************
*** 5,13 ****
  Xmh.Geometry:			508x750
  Xmh.ReplyInsertFilter:		cat
  Xmh.SendBreakWidth:		2000
! *ShapeStyle:			Oval
! *Command.BorderWidth:	1
! *MenuButton.BorderWidth:	1
  *toc*cursor:			left_ptr
  
  *menuBox.folderButton.Label:	Folder
--- 5,13 ----
  Xmh.Geometry:			508x750
  Xmh.ReplyInsertFilter:		cat
  Xmh.SendBreakWidth:		2000
! !*ShapeStyle:			Oval
! *Command.BorderWidth:	0
! *MenuButton.BorderWidth:	0
  *toc*cursor:			left_ptr
  
  *menuBox.folderButton.Label:	Folder
***************
*** 171,173 ****
--- 171,187 ----
  	<Btn1Down>,<Btn1Up>:	XmhSave()unset()\n
  *compButtons.insert.Translations:#override\n\
  	<Btn1Down>,<Btn1Up>:	XmhInsert()unset()\n
+ 
+ *Label*font:	-adobe-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1
+ *Viewport*font:	-adobe-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1
+ *SimpleMenu*font:	-adobe-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1
+ *TransientShell*font:	-adobe-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1
+ *Text*TransientShell*Form.background:	#c0c0c0
+ *Text*TransientShell*Form*Label.background:	#c0c0c0
+ *Text*TransientShell*Form*Toggle.background:	#c0c0c0
+ *Text*TransientShell*Form*Command.background:	#c0c0c0
+ *background:	#c0c0c0
+ *borderColor:	#6f6f6f
+ *Text*background:	#e7e7e7
+ *Text*Scrollbar*background:	#c0c0c0
+ *Grip*foreground:	#c0c0c0
*** _xc/programs/xsm/XSm.ad	Wed Jan 17 08:04:16 2001
--- xc/programs/xsm/XSm.ad	Sun Jul 29 04:07:08 2001
***************
*** 117,119 ****
--- 117,136 ----
  
  *badSaveOkButton.Accelerators: #override\n\
  	<Key>Return:	set() notify() unset()\n
+ 
+ *font:	-adobe-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1
+ *List.font:	7x14
+ *background:	#c0c0c0
+ *foreground:	black
+ *borderColor:	#6f6f6f
+ *Text*TransientShell*Form.background:	#c0c0c0
+ *Text*TransientShell*Form*Label.background:	#c0c0c0
+ *Text*TransientShell*Form*Toggle.background:	#c0c0c0
+ *Text*TransientShell*Form*Command.background:	#c0c0c0
+ *Text*background:	#e7e7e7
+ *Text*Scrollbar*background:	#c0c0c0
+ *Grip*foreground:	#c0c0c0
+ *Viewport*background:	#e7e7e7
+ *Viewport*Scrollbar*background:	#c0c0c0
+ *List*background:	#e7e7e7
+ *List*Scrollbar*background:	#c0c0c0
*** _xc/programs/xterm/XTerm.ad	Thu Jan 18 08:46:34 2001
--- xc/programs/xterm/XTerm.ad	Sun Jul 29 04:11:43 2001
***************
*** 8,14 ****
  XTerm.JoinSession:False
  
  *SimpleMenu*BackingStore: NotUseful
! *SimpleMenu*menuLabel.font: -adobe-helvetica-bold-r-normal--*-120-*-*-*-*-iso8859-*
  *SimpleMenu*menuLabel.vertSpace: 	100
  *SimpleMenu*HorizontalMargins: 16
  *SimpleMenu*Sme.height:	16
--- 8,14 ----
  XTerm.JoinSession:False
  
  *SimpleMenu*BackingStore: NotUseful
! *SimpleMenu*menuLabel.font: -adobe-helvetica-bold-r-normal--12-*-*-*-*-*-iso8859-*
  *SimpleMenu*menuLabel.vertSpace: 	100
  *SimpleMenu*HorizontalMargins: 16
  *SimpleMenu*Sme.height:	16
*** _xc/programs/xvidtune/Xvidtune.ad	Sun Jan 11 12:48:47 1998
--- xc/programs/xvidtune/Xvidtune.ad	Sun Jul 29 04:13:49 2001
***************
*** 179,181 ****
--- 179,193 ----
  			  <Key>x: xvidtune-shorter()\n\
  			  <Key>z: xvidtune-taller()\n\
  			  <Key>q: xvidtune-quit()
+ 
+ 
+ *font:	-adobe-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1
+ *background:	#c0c0c0
+ *borderColor:	#c0c0c0
+ *Text*borderColor:	#6f6f6f
+ *Text*background:	#e7e7e7
+ *Text*TransientShell*Form.background:	#c0c0c0
+ *Text*TransientShell*Form*Label.background:	#c0c0c0
+ *Text*TransientShell*Form*Toggle.background:	#c0c0c0
+ *Text*TransientShell*Form*Command.background:	#c0c0c0
+ *Grip*foreground:	#c0c0c0
*** _xc/config/cf/X11.tmpl	Sat Jun  2 07:21:30 2001
--- xc/config/cf/X11.tmpl	Sun Jul 29 05:09:43 2001
***************
*** 2129,2135 ****
  #ifndef SharedXawRev
  #define SharedXawRev 7.0
  #endif
! SharedDSLibReferences(XAW,Xaw,$(AWIDGETSRC),SOXAWREV,SharedXawRev)
  #else
  ProjectUnsharedLibReferences(XAW,Xaw,$(AWIDGETSRC),XBuildLibDir)
  #endif
--- 2129,2135 ----
  #ifndef SharedXawRev
  #define SharedXawRev 7.0
  #endif
! SharedDSLibReferences(XAW,Xaw3d,$(AWIDGETSRC),SOXAWREV,SharedXawRev)
  #else
  ProjectUnsharedLibReferences(XAW,Xaw,$(AWIDGETSRC),XBuildLibDir)
  #endif
*** _xc/programs/xconsole/XConsole.ad	Mon Mar 11 00:28:41 2002
--- xc/programs/xconsole/XConsole.ad	Sun Mar  3 17:42:14 2002
***************
*** 27,30 ****
  *text.allowResize:		true
  *editType:			read
  
! *shadowWidth: 0
--- 27,32 ----
  *text.allowResize:		true
  *editType:			read
  
! !*shadowWidth: 0
! XConsole*Scrollbar*background:	#c0c0c0
! 
*** xc/programs/xmessage/Xmessage.ad.orig	Thu May 16 15:07:06 2002
--- xc/programs/xmessage/Xmessage.ad	Thu May 16 15:12:49 2002
***************
*** 2,6 ****
  *baseTranslations: 		#override :<Key>Return: default-exit()
  *message.scrollVertical:	Always
  *message.scrollHorizontal:	Never
! *Command.shapeStyle:		oval
  *Command.highlightThickness:	1
--- 2,17 ----
  *baseTranslations: 		#override :<Key>Return: default-exit()
  *message.scrollVertical:	Always
  *message.scrollHorizontal:	Never
! !*Command.shapeStyle:		oval
  *Command.highlightThickness:	1
+ 
+ *font:	-adobe-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1
+ *TransientShell*font:	-adobe-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1
+ *Text*TransientShell*Form.background:	#c0c0c0
+ *Text*TransientShell*Form*Label.background:	#c0c0c0
+ *Text*TransientShell*Form*Toggle.background:	#c0c0c0
+ *Text*TransientShell*Form*Command.background:	#c0c0c0
+ *background:	#c0c0c0
+ *borderColor:	#6f6f6f
+ *Text*background:	#e7e7e7
+ *Text*Scrollbar*background:	#c0c0c0
*** xc/programs/xmag/Xmag.ad.orig	2003-01-30 09:18:37.000000000 +0900
--- xc/programs/xmag/Xmag.ad	2003-02-03 07:26:38.000000000 +0900
***************
*** 1,6 ****
  ! $Xorg: Xmag.ad,v 1.3 2000/08/17 19:54:54 cpqbld Exp $
  ! $XFree86: xc/programs/xmag/Xmag.ad,v 1.2 2003/01/19 04:44:45 paulo Exp $
! *Font: fixed
  *pane2*orientation: horizontal
  *pane2*showGrip: False
  *allowShellResize: on
--- 1,7 ----
  ! $Xorg: Xmag.ad,v 1.3 2000/08/17 19:54:54 cpqbld Exp $
  ! $XFree86: xc/programs/xmag/Xmag.ad,v 1.2 2003/01/19 04:44:45 paulo Exp $
! !*Font: fixed
! *Font:	-adobe-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1
  *pane2*orientation: horizontal
  *pane2*showGrip: False
  *allowShellResize: on
***************
*** 25,27 ****
--- 26,30 ----
  			<Btn3Up>:set()notify()unset()
  *helpLabel.font:	8x13bold
  *helpLabel.label:	xmag
+ 
+ *background:	#c0c0c0
*** xc/programs/xman/Xman.ad.orig	2003-02-03 08:53:25.000000000 +0900
--- xc/programs/xman/Xman.ad	2003-02-03 08:55:55.000000000 +0900
***************
*** 8,20 ****
  *manualBrowser.IconName:	Manual Page
  *manualBrowser.geometry:	600x600
  
! *manualFontBold:		-*-courier-bold-r-*-*-*-120-*-*-*-*-*-*
! *manualFontItalic:		-*-courier-medium-o-*-*-*-120-*-*-*-*-*-*
! *manualFontNormal:		-*-courier-medium-r-*-*-*-120-*-*-*-*-*-*
! *manualFontSymbol:		-*-symbol-*-*-*-*-*-120-*-*-*-*-*-*
! !*directoryFontNormal:		-*-courier-medium-r-*-*-*-120-*-*-*-*-*-*
! *directoryFontNormal:		-*-helvetica-medium-r-*-*-*-120-*-*-*-*-*-*
! !*directoryFontNormal:		-*-lucida-bold-r-*-*-*-120-*-*-*-*-*-*
  
  !*SimpleMenu.BackingStore:	Always
  !*SimpleMenu.SaveUnder:		Off
--- 8,20 ----
  *manualBrowser.IconName:	Manual Page
  *manualBrowser.geometry:	600x600
  
! *manualFontBold:		-*-courier-bold-r-*-*-12-*-*-*-*-*-*-*
! *manualFontItalic:		-*-courier-medium-o-*-*-12-*-*-*-*-*-*-*
! *manualFontNormal:		-*-courier-medium-r-*-*-12-*-*-*-*-*-*-*
! *manualFontSymbol:		-*-symbol-*-*-*-*-12-*-*-*-*-*-*-*
! !*directoryFontNormal:		-*-courier-medium-r-*-*-12-*-*-*-*-*-*-*
! *directoryFontNormal:		-adobe-helvetica-medium-r-*-*-12-*-*-*-*-*-*-*
! !*directoryFontNormal:		-*-lucida-bold-r-*-*-12-*-*-*-*-*-*-*
  
  !*SimpleMenu.BackingStore:	Always
  !*SimpleMenu.SaveUnder:		Off
***************
*** 176,178 ****
--- 176,193 ----
  
  *manpageButton.translations: #augment \
  		<Btn1Down>,<Btn1Up>: CreateNewManpage() reset()
+ 
+ *font:	-adobe-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1
+ *background:	#c0c0c0
+ *borderColor:	#6f6f6f
+ *fontName*background:	#e7e7e7
+ *Viewport*background:	#ffffff
+ *Viewport*Scrollbar*background:	#c0c0c0
+ *ScrollByLine*background:	#ffffff
+ *ScrollByLine*Scrollbar*background:	#c0c0c0
+ *Text*background:	#e7e7e7
+ *Text*TransientShell*Form.background:	#c0c0c0
+ *Text*TransientShell*Form*Label.background:	#c0c0c0
+ *Text*TransientShell*Form*Toggle.background:	#c0c0c0
+ *Text*TransientShell*Form*Command.background:	#c0c0c0
+ *Grip*foreground:	#c0c0c0
*** xc/lib/Imakefile.orig	2003-08-25 20:03:18.000000000 +0900
--- xc/lib/Imakefile	2003-11-10 22:37:49.000000000 +0900
***************
*** 191,196 ****
--- 191,197 ----
  XMUULIBDIR = Xmuu
  XPMLIBDIR = Xpm
  XAWLIBDIR = Xaw
+ XAW3DLIBDIR = Xaw3d
  XTSTLIBDIR = Xtst
  FSLIBDIR = FS
  #endif
***************
*** 200,206 ****
               $(OLDXLIBDIR) $(ICELIBDIR) $(SMLIBDIR) $(XEXTLIBDIR) $(XTLIBDIR) \
               $(SSLIBDIR) $(XF86MISCLIBDIR) $(XF86VMLIBDIR) $(XF86DGALIBDIR) \
               $(XF86RUSHLIBDIR) $(XMULIBDIR) $(XMUULIBDIR) $(XPMLIBDIR) \
!              $(XAW6LIBDIR) $(XAWLIBDIR) $(XINPUTLIBDIR) \
               $(XTSTLIBDIR) $(FSLIBDIR) $(XKBLIBDIR) \
               $(XKBUILIBDIR) $(LBXUTILDIR) $(XALIBDIR) $(XPRINTLIBDIR) \
               $(XVLIBDIR) $(GLXLIBDIR) $(GLULIBDIR) $(GLWLIBDIR) \
--- 201,207 ----
               $(OLDXLIBDIR) $(ICELIBDIR) $(SMLIBDIR) $(XEXTLIBDIR) $(XTLIBDIR) \
               $(SSLIBDIR) $(XF86MISCLIBDIR) $(XF86VMLIBDIR) $(XF86DGALIBDIR) \
               $(XF86RUSHLIBDIR) $(XMULIBDIR) $(XMUULIBDIR) $(XPMLIBDIR) \
!              $(XAW6LIBDIR) $(XAWLIBDIR) $(XAW3DLIBDIR) $(XINPUTLIBDIR) \
               $(XTSTLIBDIR) $(FSLIBDIR) $(XKBLIBDIR) \
               $(XKBUILIBDIR) $(LBXUTILDIR) $(XALIBDIR) $(XPRINTLIBDIR) \
               $(XVLIBDIR) $(GLXLIBDIR) $(GLULIBDIR) $(GLWLIBDIR) \
*** xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile.orig	2003-11-02 13:45:43.000000000 +0900
--- xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile	2003-11-11 00:38:28.000000000 +0900
***************
*** 117,123 ****
  #endif
  
  LOCAL_LIBRARIES = $(XKBUILIB) $(XKBFILELIB) -lxf86config $(XXF86MISCLIB) \
! 		  $(XXF86VMLIB) $(XAWLIB) $(XMULIB) $(XTOOLLIB) \
  		  $(XPMLIB) $(LOADERLIB) $(DLLIB) $(XLIB) $(CURSESLIB) \
  		  RegexLibrary -lm
  
--- 117,123 ----
  #endif
  
  LOCAL_LIBRARIES = $(XKBUILIB) $(XKBFILELIB) -lxf86config $(XXF86MISCLIB) \
! 		  $(XXF86VMLIB) -lXaw $(XMULIB) $(XTOOLLIB) \
  		  $(XPMLIB) $(LOADERLIB) $(DLLIB) $(XLIB) $(CURSESLIB) \
  		  RegexLibrary -lm
  
*** xc/programs/xedit/Imakefile.orig	2003-05-25 20:06:01.000000000 +0900
--- xc/programs/xedit/Imakefile	2003-11-11 00:35:48.000000000 +0900
***************
*** 18,24 ****
         LISP_OBJ = lisp.o
  
          DEPLIBS = XawClientDepLibs $(SUBDIRS)
! LOCAL_LIBRARIES = $(LISPLIBS) XawClientLibs $(DLLIB)
    SYS_LIBRARIES = MathLibrary
  #if defined(LynxOSArchitecture) || defined(SVR3Architecture) || defined(LinuxArchitecture)
          RP_SRCS = realpath.c
--- 18,24 ----
         LISP_OBJ = lisp.o
  
          DEPLIBS = XawClientDepLibs $(SUBDIRS)
! LOCAL_LIBRARIES = $(LISPLIBS) -lXaw $(DLLIB)
    SYS_LIBRARIES = MathLibrary
  #if defined(LynxOSArchitecture) || defined(SVR3Architecture) || defined(LinuxArchitecture)
          RP_SRCS = realpath.c
*** xc/programs/xfontsel/Imakefile.orig	2000-02-13 12:26:23.000000000 +0900
--- xc/programs/xfontsel/Imakefile	2003-11-11 00:39:12.000000000 +0900
***************
*** 2,8 ****
             SRCS = xfontsel.c ULabel.c
             OBJS = xfontsel.o ULabel.o
          DEPLIBS = XawClientDepLibs
! LOCAL_LIBRARIES = XawClientLibs
  
  ComplexProgramTarget(xfontsel)
  
--- 2,8 ----
             SRCS = xfontsel.c ULabel.c
             OBJS = xfontsel.o ULabel.o
          DEPLIBS = XawClientDepLibs
! LOCAL_LIBRARIES = -lXaw
  
  ComplexProgramTarget(xfontsel)
  
