diff options
| author | alanh <alanh> | 2000-09-22 17:06:37 +0000 |
|---|---|---|
| committer | alanh <alanh> | 2000-09-22 17:06:37 +0000 |
| commit | 585028e1a2b5cc7ad96a5a84518014610e55814a (patch) | |
| tree | d1954bf1cb5136007345a256c55871648d05e55b /xc/lib/Xaw | |
| parent | c0fd23c13d4bbe14ab6908e8444aefe0ed22176c (diff) | |
Import of XFree86 4.0.1d-pre
Diffstat (limited to 'xc/lib/Xaw')
120 files changed, 210 insertions, 208 deletions
diff --git a/xc/lib/Xaw/Actions.c b/xc/lib/Xaw/Actions.c index 92c4966eb..0891d897b 100644 --- a/xc/lib/Xaw/Actions.c +++ b/xc/lib/Xaw/Actions.c @@ -25,7 +25,7 @@ * XFree86 Project. */ -/* $XFree86: xc/lib/Xaw/Actions.c,v 3.14 1999/06/06 08:47:50 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Actions.c,v 3.13 1999/03/14 03:21:09 dawes Exp $ */ #include <ctype.h> #include <stdio.h> diff --git a/xc/lib/Xaw/AsciiSink.c b/xc/lib/Xaw/AsciiSink.c index deb298b67..0072e6777 100644 --- a/xc/lib/Xaw/AsciiSink.c +++ b/xc/lib/Xaw/AsciiSink.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/AsciiSink.c,v 1.21 1999/09/27 06:29:09 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/AsciiSink.c,v 1.20 1999/08/28 09:00:25 dawes Exp $ */ #include <stdio.h> #include <X11/IntrinsicP.h> diff --git a/xc/lib/Xaw/AsciiSink.h b/xc/lib/Xaw/AsciiSink.h index a25282063..7ac6ae7a1 100644 --- a/xc/lib/Xaw/AsciiSink.h +++ b/xc/lib/Xaw/AsciiSink.h @@ -44,7 +44,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/AsciiSink.h,v 1.4 1998/10/03 08:41:59 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/AsciiSink.h,v 1.3 1998/08/20 13:58:54 dawes Exp $ */ #ifndef _XawAsciiSink_h #define _XawAsciiSink_h diff --git a/xc/lib/Xaw/AsciiSinkP.h b/xc/lib/Xaw/AsciiSinkP.h index 7bb45bd73..ac89ea56b 100644 --- a/xc/lib/Xaw/AsciiSinkP.h +++ b/xc/lib/Xaw/AsciiSinkP.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/AsciiSinkP.h,v 1.8 1999/06/20 08:40:55 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/AsciiSinkP.h,v 1.7 1999/06/06 08:47:51 dawes Exp $ */ #ifndef _XawAsciiSinkP_h #define _XawAsciiSinkP_h diff --git a/xc/lib/Xaw/AsciiSrc.c b/xc/lib/Xaw/AsciiSrc.c index 9d8f30d91..d97c4ef82 100644 --- a/xc/lib/Xaw/AsciiSrc.c +++ b/xc/lib/Xaw/AsciiSrc.c @@ -22,7 +22,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/AsciiSrc.c,v 1.24 2000/06/13 23:15:48 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/AsciiSrc.c,v 1.23 1999/09/27 06:29:10 dawes Exp $ */ /* * AsciiSrc.c - AsciiSrc object. (For use with the text widget). diff --git a/xc/lib/Xaw/AsciiSrc.h b/xc/lib/Xaw/AsciiSrc.h index e4d11e60f..bcc244d62 100644 --- a/xc/lib/Xaw/AsciiSrc.h +++ b/xc/lib/Xaw/AsciiSrc.h @@ -21,7 +21,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/AsciiSrc.h,v 1.6 1999/05/09 10:51:36 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/AsciiSrc.h,v 1.5 1998/10/03 08:42:00 dawes Exp $ */ /* diff --git a/xc/lib/Xaw/AsciiSrcP.h b/xc/lib/Xaw/AsciiSrcP.h index 4513eb4b5..16b61ff45 100644 --- a/xc/lib/Xaw/AsciiSrcP.h +++ b/xc/lib/Xaw/AsciiSrcP.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/AsciiSrcP.h,v 1.7 1999/06/20 08:40:57 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/AsciiSrcP.h,v 1.6 1999/06/06 08:47:52 dawes Exp $ */ /* * AsciiSrcP.h - Private Header for Ascii Text Source. diff --git a/xc/lib/Xaw/AsciiText.c b/xc/lib/Xaw/AsciiText.c index f4d6d52bb..bda9b966e 100644 --- a/xc/lib/Xaw/AsciiText.c +++ b/xc/lib/Xaw/AsciiText.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/lib/Xaw/AsciiText.c,v 3.8 1999/06/13 13:47:15 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/AsciiText.c,v 3.7 1999/06/06 08:47:52 dawes Exp $ */ /* * AsciiText.c - Source code for AsciiText Widget diff --git a/xc/lib/Xaw/AsciiText.h b/xc/lib/Xaw/AsciiText.h index 3772b0f10..5c5b542c5 100644 --- a/xc/lib/Xaw/AsciiText.h +++ b/xc/lib/Xaw/AsciiText.h @@ -44,7 +44,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/AsciiText.h,v 1.4 1998/10/03 08:42:01 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/AsciiText.h,v 1.3 1998/08/20 13:58:55 dawes Exp $ */ /* * AsciiText.h - Public header file for AsciiText Widget diff --git a/xc/lib/Xaw/AsciiTextP.h b/xc/lib/Xaw/AsciiTextP.h index 806dfe640..09c675fcd 100644 --- a/xc/lib/Xaw/AsciiTextP.h +++ b/xc/lib/Xaw/AsciiTextP.h @@ -44,7 +44,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/AsciiTextP.h,v 1.7 1999/06/20 08:40:57 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/AsciiTextP.h,v 1.6 1999/06/13 13:47:15 dawes Exp $ */ /* * AsciiText.c - Private header file for AsciiText Widget. diff --git a/xc/lib/Xaw/Box.c b/xc/lib/Xaw/Box.c index 1ff4c1734..24587babc 100644 --- a/xc/lib/Xaw/Box.c +++ b/xc/lib/Xaw/Box.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Box.c,v 1.13 1999/06/06 08:47:53 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Box.c,v 1.12 1999/05/09 10:51:36 dawes Exp $ */ #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> diff --git a/xc/lib/Xaw/Box.h b/xc/lib/Xaw/Box.h index baaf140c6..03488bee9 100644 --- a/xc/lib/Xaw/Box.h +++ b/xc/lib/Xaw/Box.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Box.h,v 1.6 1999/06/06 08:47:53 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Box.h,v 1.5 1998/10/03 08:42:02 dawes Exp $ */ #ifndef _XawBox_h #define _XawBox_h diff --git a/xc/lib/Xaw/BoxP.h b/xc/lib/Xaw/BoxP.h index 479b71237..58ef57ac0 100644 --- a/xc/lib/Xaw/BoxP.h +++ b/xc/lib/Xaw/BoxP.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/BoxP.h,v 1.9 1999/06/20 08:40:57 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/BoxP.h,v 1.8 1999/06/06 08:47:53 dawes Exp $ */ #ifndef _XawBoxP_h #define _XawBoxP_h diff --git a/xc/lib/Xaw/Changelog b/xc/lib/Xaw/Changelog index 5a1d67408..178176194 100644 --- a/xc/lib/Xaw/Changelog +++ b/xc/lib/Xaw/Changelog @@ -1367,4 +1367,4 @@ xedit.c: -$XFree86: xc/lib/Xaw/Changelog,v 3.32 1999/08/28 09:00:26 dawes Exp $ +$XFree86: xc/lib/Xaw/Changelog,v 3.31 1999/08/15 13:00:31 dawes Exp $ diff --git a/xc/lib/Xaw/Command.c b/xc/lib/Xaw/Command.c index c29d1e89f..d11d2051b 100644 --- a/xc/lib/Xaw/Command.c +++ b/xc/lib/Xaw/Command.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Command.c,v 1.11 1999/06/13 13:47:18 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Command.c,v 1.10 1999/06/06 08:47:54 dawes Exp $ */ /* * Command.c - Command button widget diff --git a/xc/lib/Xaw/Command.h b/xc/lib/Xaw/Command.h index 38d417914..9d084df2c 100644 --- a/xc/lib/Xaw/Command.h +++ b/xc/lib/Xaw/Command.h @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Command.h,v 1.4 1998/10/03 08:42:03 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Command.h,v 1.3 1998/08/20 13:58:57 dawes Exp $ */ #ifndef _XawCommand_h #define _XawCommand_h diff --git a/xc/lib/Xaw/CommandP.h b/xc/lib/Xaw/CommandP.h index 516b86146..df367bf8a 100644 --- a/xc/lib/Xaw/CommandP.h +++ b/xc/lib/Xaw/CommandP.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/CommandP.h,v 1.6 1999/06/20 08:40:58 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/CommandP.h,v 1.5 1999/06/06 08:47:54 dawes Exp $ */ #ifndef _XawCommandP_h #define _XawCommandP_h diff --git a/xc/lib/Xaw/Converters.c b/xc/lib/Xaw/Converters.c index 99ea5aa94..11a9aab81 100644 --- a/xc/lib/Xaw/Converters.c +++ b/xc/lib/Xaw/Converters.c @@ -25,7 +25,7 @@ * XFree86 Project. */ -/* $XFree86: xc/lib/Xaw/Converters.c,v 3.14 1999/06/20 08:40:59 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Converters.c,v 3.13 1999/06/06 08:47:54 dawes Exp $ */ #include <stdio.h> #include <X11/IntrinsicP.h> diff --git a/xc/lib/Xaw/Dialog.c b/xc/lib/Xaw/Dialog.c index aabd161bd..d719b88e7 100644 --- a/xc/lib/Xaw/Dialog.c +++ b/xc/lib/Xaw/Dialog.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Dialog.c,v 1.6 2000/06/13 23:15:48 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Dialog.c,v 1.5 1999/06/06 08:47:55 dawes Exp $ */ #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> diff --git a/xc/lib/Xaw/Dialog.h b/xc/lib/Xaw/Dialog.h index 4a5863b86..78a9bad21 100644 --- a/xc/lib/Xaw/Dialog.h +++ b/xc/lib/Xaw/Dialog.h @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Dialog.h,v 1.4 1998/10/03 08:42:04 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Dialog.h,v 1.3 1998/08/20 13:58:58 dawes Exp $ */ #ifndef _XawDialog_h #define _XawDialog_h diff --git a/xc/lib/Xaw/DialogP.h b/xc/lib/Xaw/DialogP.h index 3e4054ba0..60cce86e7 100644 --- a/xc/lib/Xaw/DialogP.h +++ b/xc/lib/Xaw/DialogP.h @@ -43,7 +43,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/DialogP.h,v 1.7 1999/06/20 08:40:59 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/DialogP.h,v 1.6 1999/06/06 08:47:55 dawes Exp $ */ #ifndef _DialogP_h #define _DialogP_h diff --git a/xc/lib/Xaw/DisplayList.c b/xc/lib/Xaw/DisplayList.c index e791de74f..69cb32106 100644 --- a/xc/lib/Xaw/DisplayList.c +++ b/xc/lib/Xaw/DisplayList.c @@ -27,7 +27,7 @@ * Author: Paulo César Pereira de Andrade */ -/* $XFree86: xc/lib/Xaw/DisplayList.c,v 3.15 1999/08/28 09:00:26 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/DisplayList.c,v 3.14 1999/06/20 08:40:59 dawes Exp $ */ #include <ctype.h> #include <string.h> diff --git a/xc/lib/Xaw/Form.c b/xc/lib/Xaw/Form.c index d94f28669..76b51f32d 100644 --- a/xc/lib/Xaw/Form.c +++ b/xc/lib/Xaw/Form.c @@ -1099,7 +1099,7 @@ XawFormDoLayout(Widget w, Widget nw = *childP; if (XtIsManaged(nw)) { - FormConstraints form = (FormConstraints)w->core.constraints; + FormConstraints form = (FormConstraints)nw->core.constraints; /* * Xt Configure widget is too smart, and optimizes out diff --git a/xc/lib/Xaw/Form.h b/xc/lib/Xaw/Form.h index 56dfbb30e..30c4464b7 100644 --- a/xc/lib/Xaw/Form.h +++ b/xc/lib/Xaw/Form.h @@ -43,7 +43,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Form.h,v 1.7 1999/06/06 08:47:56 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Form.h,v 1.6 1999/05/03 12:15:39 dawes Exp $ */ #ifndef _XawForm_h #define _XawForm_h diff --git a/xc/lib/Xaw/FormP.h b/xc/lib/Xaw/FormP.h index 8134ce5c1..6ec8b4d1c 100644 --- a/xc/lib/Xaw/FormP.h +++ b/xc/lib/Xaw/FormP.h @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/FormP.h,v 1.11 1999/06/20 08:41:00 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/FormP.h,v 1.10 1999/06/13 13:47:19 dawes Exp $ */ /* Form widget private definitions */ diff --git a/xc/lib/Xaw/Grip.c b/xc/lib/Xaw/Grip.c index c8ac68c3d..f106cd075 100644 --- a/xc/lib/Xaw/Grip.c +++ b/xc/lib/Xaw/Grip.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Grip.c,v 1.6 1999/06/06 08:47:57 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Grip.c,v 1.5 1998/10/03 08:42:05 dawes Exp $ */ /* * Grip.c - Grip Widget (Used by Paned Widget) diff --git a/xc/lib/Xaw/Grip.h b/xc/lib/Xaw/Grip.h index fe861ac7d..61d713e7b 100644 --- a/xc/lib/Xaw/Grip.h +++ b/xc/lib/Xaw/Grip.h @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Grip.h,v 1.5 1999/06/06 08:47:57 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Grip.h,v 1.4 1998/10/03 08:42:05 dawes Exp $ */ /* * Grip.h - Public Definitions for Grip widget (used by VPane Widget) diff --git a/xc/lib/Xaw/GripP.h b/xc/lib/Xaw/GripP.h index ac2d82c27..5f7e38b71 100644 --- a/xc/lib/Xaw/GripP.h +++ b/xc/lib/Xaw/GripP.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/GripP.h,v 1.6 1999/06/20 08:41:01 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/GripP.h,v 1.5 1999/06/06 08:47:57 dawes Exp $ */ #ifndef _XawGripP_h #define _XawGripP_h diff --git a/xc/lib/Xaw/Imakefile b/xc/lib/Xaw/Imakefile index 73df2c7cb..79377f73a 100644 --- a/xc/lib/Xaw/Imakefile +++ b/xc/lib/Xaw/Imakefile @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile /main/87 1996/09/28 16:43:34 rws $ -XCOMM $XFree86: xc/lib/Xaw/Imakefile,v 1.9 2000/05/18 16:29:52 dawes Exp $ +XCOMM $XFree86: xc/lib/Xaw/Imakefile,v 1.8 1999/06/27 14:07:33 dawes Exp $ #define DoNormalLib NormalLibXaw #define DoSharedLib SharedLibXaw #define DoExtraLib SharedLibXaw diff --git a/xc/lib/Xaw/Label.c b/xc/lib/Xaw/Label.c index b62fa46ad..54fdfa93d 100644 --- a/xc/lib/Xaw/Label.c +++ b/xc/lib/Xaw/Label.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Label.c,v 1.11 1999/06/27 14:07:33 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Label.c,v 1.10 1999/06/06 08:47:58 dawes Exp $ */ #include <stdio.h> #include <ctype.h> diff --git a/xc/lib/Xaw/Label.h b/xc/lib/Xaw/Label.h index 649d39b9a..5ff79dfd4 100644 --- a/xc/lib/Xaw/Label.h +++ b/xc/lib/Xaw/Label.h @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Label.h,v 1.5 1998/10/03 08:42:06 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Label.h,v 1.4 1998/08/20 13:59:00 dawes Exp $ */ #ifndef _XawLabel_h #define _XawLabel_h diff --git a/xc/lib/Xaw/LabelP.h b/xc/lib/Xaw/LabelP.h index 55b20ac6f..c95a7bb44 100644 --- a/xc/lib/Xaw/LabelP.h +++ b/xc/lib/Xaw/LabelP.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/LabelP.h,v 1.6 1999/06/20 08:41:02 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/LabelP.h,v 1.5 1999/06/06 08:47:58 dawes Exp $ */ #ifndef _XawLabelP_h #define _XawLabelP_h diff --git a/xc/lib/Xaw/List.c b/xc/lib/Xaw/List.c index 41876abff..65bca9387 100644 --- a/xc/lib/Xaw/List.c +++ b/xc/lib/Xaw/List.c @@ -19,7 +19,7 @@ Except as contained in this notice, the name of The Open Group shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/List.c,v 1.15 2000/04/04 22:36:42 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/List.c,v 1.14 2000/02/25 23:20:46 dawes Exp $ */ /* * List.c - List widget diff --git a/xc/lib/Xaw/List.h b/xc/lib/Xaw/List.h index 3c695a18e..89b32cb2d 100644 --- a/xc/lib/Xaw/List.h +++ b/xc/lib/Xaw/List.h @@ -19,7 +19,7 @@ Except as contained in this notice, the name of The Open Group shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/List.h,v 1.6 2000/02/25 18:27:58 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/List.h,v 1.5 1999/05/03 12:15:40 dawes Exp $ */ /* This is the List widget, it is useful to display a list, without the * overhead of having a widget for each item in the list. It allows diff --git a/xc/lib/Xaw/ListP.h b/xc/lib/Xaw/ListP.h index ad68726ac..f4d510b74 100644 --- a/xc/lib/Xaw/ListP.h +++ b/xc/lib/Xaw/ListP.h @@ -19,7 +19,7 @@ Except as contained in this notice, the name of The Open Group shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/ListP.h,v 1.7 2000/02/25 18:27:58 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/ListP.h,v 1.6 1999/06/20 08:41:02 dawes Exp $ */ /* diff --git a/xc/lib/Xaw/MenuButtoP.h b/xc/lib/Xaw/MenuButtoP.h index 7110fa0c9..9fc41eb15 100644 --- a/xc/lib/Xaw/MenuButtoP.h +++ b/xc/lib/Xaw/MenuButtoP.h @@ -18,7 +18,7 @@ Except as contained in this notice, the name of The Open Group shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/MenuButtoP.h,v 1.6 1999/06/20 08:41:02 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/MenuButtoP.h,v 1.5 1999/06/06 08:47:59 dawes Exp $ */ /* * MenuButtonP.h - Private Header file for MenuButton widget. diff --git a/xc/lib/Xaw/MenuButton.c b/xc/lib/Xaw/MenuButton.c index 361667333..e1cd715ff 100644 --- a/xc/lib/Xaw/MenuButton.c +++ b/xc/lib/Xaw/MenuButton.c @@ -21,7 +21,7 @@ in this Software without prior written authorization from The Open Group. * */ -/* $XFree86: xc/lib/Xaw/MenuButton.c,v 3.7 1999/06/06 08:47:59 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/MenuButton.c,v 3.6 1998/10/03 08:42:08 dawes Exp $ */ /* * MenuButton.c - Source code for MenuButton widget. diff --git a/xc/lib/Xaw/MenuButton.h b/xc/lib/Xaw/MenuButton.h index b7ff60cef..8cebfc1d0 100644 --- a/xc/lib/Xaw/MenuButton.h +++ b/xc/lib/Xaw/MenuButton.h @@ -19,7 +19,7 @@ Except as contained in this notice, the name of The Open Group shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/MenuButton.h,v 1.4 1998/10/03 08:42:08 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/MenuButton.h,v 1.3 1998/08/20 13:59:02 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/lib/Xaw/MultiSink.c b/xc/lib/Xaw/MultiSink.c index 90e7bb959..48b1e7b17 100644 --- a/xc/lib/Xaw/MultiSink.c +++ b/xc/lib/Xaw/MultiSink.c @@ -66,7 +66,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/MultiSink.c,v 1.17 1999/06/13 13:47:19 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/MultiSink.c,v 1.16 1999/06/06 08:48:00 dawes Exp $ */ #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> diff --git a/xc/lib/Xaw/MultiSink.h b/xc/lib/Xaw/MultiSink.h index 679329fde..337ad6730 100644 --- a/xc/lib/Xaw/MultiSink.h +++ b/xc/lib/Xaw/MultiSink.h @@ -66,7 +66,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/MultiSink.h,v 1.4 1998/10/03 08:42:09 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/MultiSink.h,v 1.3 1998/08/20 13:59:03 dawes Exp $ */ #ifndef _XawMultiSink_h #define _XawMultiSink_h diff --git a/xc/lib/Xaw/MultiSinkP.h b/xc/lib/Xaw/MultiSinkP.h index 436aeccf4..cd7f22a8b 100644 --- a/xc/lib/Xaw/MultiSinkP.h +++ b/xc/lib/Xaw/MultiSinkP.h @@ -67,7 +67,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/MultiSinkP.h,v 1.7 1999/06/20 08:41:02 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/MultiSinkP.h,v 1.6 1999/06/06 08:48:00 dawes Exp $ */ #ifndef _XawMultiSinkP_h #define _XawMultiSinkP_h diff --git a/xc/lib/Xaw/MultiSrc.c b/xc/lib/Xaw/MultiSrc.c index b917e671c..2f32049e6 100644 --- a/xc/lib/Xaw/MultiSrc.c +++ b/xc/lib/Xaw/MultiSrc.c @@ -27,7 +27,7 @@ * * Much code taken from X11R3 String and Disk Sources. */ -/* $XFree86: xc/lib/Xaw/MultiSrc.c,v 1.19 1999/07/19 13:36:02 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/MultiSrc.c,v 1.18 1999/06/20 08:41:03 dawes Exp $ */ /* diff --git a/xc/lib/Xaw/MultiSrc.h b/xc/lib/Xaw/MultiSrc.h index 586c06d50..d4161cae0 100644 --- a/xc/lib/Xaw/MultiSrc.h +++ b/xc/lib/Xaw/MultiSrc.h @@ -45,7 +45,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/MultiSrc.h,v 1.5 1999/05/09 10:51:39 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/MultiSrc.h,v 1.4 1998/10/03 08:42:12 dawes Exp $ */ /* * This file was modified from AsciiSrc.h. diff --git a/xc/lib/Xaw/MultiSrcP.h b/xc/lib/Xaw/MultiSrcP.h index 71e58c0bb..3ed461773 100644 --- a/xc/lib/Xaw/MultiSrcP.h +++ b/xc/lib/Xaw/MultiSrcP.h @@ -67,7 +67,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/MultiSrcP.h,v 1.7 1999/06/20 08:41:03 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/MultiSrcP.h,v 1.6 1999/06/06 08:48:01 dawes Exp $ */ /* * MultiSrcP.h - Private Header for Multi Text Source. diff --git a/xc/lib/Xaw/OS.c b/xc/lib/Xaw/OS.c index e91f36d0d..628372d46 100644 --- a/xc/lib/Xaw/OS.c +++ b/xc/lib/Xaw/OS.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/Xaw/OS.c,v 1.2 1998/12/06 11:24:32 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/OS.c,v 1.1 1998/12/06 10:44:34 dawes Exp $ */ /* Some OS-dependent utility code */ diff --git a/xc/lib/Xaw/Paned.c b/xc/lib/Xaw/Paned.c index 6fb6bb52b..192e978fc 100644 --- a/xc/lib/Xaw/Paned.c +++ b/xc/lib/Xaw/Paned.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Paned.c,v 1.9 1999/06/06 08:48:01 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Paned.c,v 1.8 1999/05/03 12:15:41 dawes Exp $ */ /* * Updated and significantly modified from the Athena VPaned Widget. diff --git a/xc/lib/Xaw/Paned.h b/xc/lib/Xaw/Paned.h index aa6763b5e..47b702731 100644 --- a/xc/lib/Xaw/Paned.h +++ b/xc/lib/Xaw/Paned.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Paned.h,v 1.5 1999/05/03 12:15:42 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Paned.h,v 1.4 1998/10/03 08:42:13 dawes Exp $ */ /* * Paned.h - Paned Composite Widget's public header file. diff --git a/xc/lib/Xaw/PanedP.h b/xc/lib/Xaw/PanedP.h index 9a4ea3236..943cdb7c0 100644 --- a/xc/lib/Xaw/PanedP.h +++ b/xc/lib/Xaw/PanedP.h @@ -43,7 +43,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/PanedP.h,v 1.6 1999/06/20 08:41:04 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/PanedP.h,v 1.5 1999/06/06 08:48:02 dawes Exp $ */ /* * Updated and significantly modified from the Athena VPaned Widget. diff --git a/xc/lib/Xaw/Panner.c b/xc/lib/Xaw/Panner.c index 6be4ac896..dbcdac743 100644 --- a/xc/lib/Xaw/Panner.c +++ b/xc/lib/Xaw/Panner.c @@ -22,7 +22,7 @@ in this Software without prior written authorization from The Open Group. * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/lib/Xaw/Panner.c,v 3.5 1999/06/06 08:48:02 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Panner.c,v 3.4 1998/10/03 08:42:14 dawes Exp $ */ #include <ctype.h> #include <math.h> diff --git a/xc/lib/Xaw/Panner.h b/xc/lib/Xaw/Panner.h index 5af7ca759..5e2e035c4 100644 --- a/xc/lib/Xaw/Panner.h +++ b/xc/lib/Xaw/Panner.h @@ -21,7 +21,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/lib/Xaw/Panner.h,v 1.4 1998/10/03 08:42:14 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Panner.h,v 1.3 1998/08/20 13:59:05 dawes Exp $ */ #ifndef _XawPanner_h #define _XawPanner_h diff --git a/xc/lib/Xaw/PannerP.h b/xc/lib/Xaw/PannerP.h index 50951e88d..fb8be018a 100644 --- a/xc/lib/Xaw/PannerP.h +++ b/xc/lib/Xaw/PannerP.h @@ -21,7 +21,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/lib/Xaw/PannerP.h,v 1.6 1999/06/20 08:41:04 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/PannerP.h,v 1.5 1999/06/06 08:48:06 dawes Exp $ */ #ifndef _XawPannerP_h #define _XawPannerP_h diff --git a/xc/lib/Xaw/Pixmap.c b/xc/lib/Xaw/Pixmap.c index 16e6fbfb2..7a0ff2094 100644 --- a/xc/lib/Xaw/Pixmap.c +++ b/xc/lib/Xaw/Pixmap.c @@ -25,7 +25,7 @@ * XFree86 Project. */ -/* $XFree86: xc/lib/Xaw/Pixmap.c,v 3.14 2000/05/18 16:29:52 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Pixmap.c,v 3.13 1999/07/11 08:49:14 dawes Exp $ */ #include <string.h> #include <stdio.h> diff --git a/xc/lib/Xaw/Porthole.c b/xc/lib/Xaw/Porthole.c index 02a4307dd..4f2fd2563 100644 --- a/xc/lib/Xaw/Porthole.c +++ b/xc/lib/Xaw/Porthole.c @@ -24,7 +24,7 @@ in this Software without prior written authorization from The Open Group. * This widget is a trivial clipping widget. It is typically used with a * panner or scrollbar to navigate. */ -/* $XFree86: xc/lib/Xaw/Porthole.c,v 1.5 1999/06/06 08:48:06 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Porthole.c,v 1.4 1998/10/03 08:42:15 dawes Exp $ */ #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> diff --git a/xc/lib/Xaw/Porthole.h b/xc/lib/Xaw/Porthole.h index fb929145b..a3d524e02 100644 --- a/xc/lib/Xaw/Porthole.h +++ b/xc/lib/Xaw/Porthole.h @@ -21,7 +21,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/lib/Xaw/Porthole.h,v 1.4 1998/10/03 08:42:15 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Porthole.h,v 1.3 1998/08/20 13:59:06 dawes Exp $ */ #ifndef _XawPorthole_h #define _XawPorthole_h diff --git a/xc/lib/Xaw/PortholeP.h b/xc/lib/Xaw/PortholeP.h index a6dabd82c..1713362df 100644 --- a/xc/lib/Xaw/PortholeP.h +++ b/xc/lib/Xaw/PortholeP.h @@ -21,7 +21,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/lib/Xaw/PortholeP.h,v 1.6 1999/06/20 08:41:04 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/PortholeP.h,v 1.5 1999/06/06 08:48:07 dawes Exp $ */ #ifndef _XawPortholeP_h #define _XawPortholeP_h diff --git a/xc/lib/Xaw/Private.h b/xc/lib/Xaw/Private.h index 5bdf73cb4..a76207a4d 100644 --- a/xc/lib/Xaw/Private.h +++ b/xc/lib/Xaw/Private.h @@ -25,7 +25,7 @@ * XFree86 Project. */ -/* $XFree86: xc/lib/Xaw/Private.h,v 3.10 1999/06/06 08:48:07 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Private.h,v 3.9 1999/05/16 10:12:48 dawes Exp $ */ #ifndef _XawPrivate_h #define _XawPrivate_h diff --git a/xc/lib/Xaw/Repeater.c b/xc/lib/Xaw/Repeater.c index f8fc16cdc..fb2400435 100644 --- a/xc/lib/Xaw/Repeater.c +++ b/xc/lib/Xaw/Repeater.c @@ -23,7 +23,7 @@ in this Software without prior written authorization from The Open Group. * * This widget is used for press-and-hold style buttons. */ -/* $XFree86: xc/lib/Xaw/Repeater.c,v 1.5 1999/06/06 08:48:07 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Repeater.c,v 1.4 1998/10/03 08:42:16 dawes Exp $ */ #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> diff --git a/xc/lib/Xaw/Repeater.h b/xc/lib/Xaw/Repeater.h index e2cf08f2d..4910aa2b7 100644 --- a/xc/lib/Xaw/Repeater.h +++ b/xc/lib/Xaw/Repeater.h @@ -21,7 +21,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/lib/Xaw/Repeater.h,v 1.4 1998/10/03 08:42:16 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Repeater.h,v 1.3 1998/08/20 13:59:06 dawes Exp $ */ #ifndef _XawRepeater_h #define _XawRepeater_h diff --git a/xc/lib/Xaw/RepeaterP.h b/xc/lib/Xaw/RepeaterP.h index 4fcbb51a7..cc7499ea7 100644 --- a/xc/lib/Xaw/RepeaterP.h +++ b/xc/lib/Xaw/RepeaterP.h @@ -21,7 +21,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/lib/Xaw/RepeaterP.h,v 1.6 1999/06/20 08:41:05 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/RepeaterP.h,v 1.5 1999/06/06 08:48:08 dawes Exp $ */ #ifndef _XawRepeaterP_h #define _XawRepeaterP_h diff --git a/xc/lib/Xaw/Scrollbar.c b/xc/lib/Xaw/Scrollbar.c index 3e204a450..65acce036 100644 --- a/xc/lib/Xaw/Scrollbar.c +++ b/xc/lib/Xaw/Scrollbar.c @@ -831,6 +831,10 @@ static void NotifyThumb(Widget gw, XEvent *event, String *params, Cardinal *num_params) { ScrollbarWidget w = (ScrollbarWidget)gw; + union { + XtPointer xtp; + float xtf; + } xtpf; if (w->scrollbar.direction == 0) /* if no StartScroll */ return; @@ -841,7 +845,8 @@ NotifyThumb(Widget gw, XEvent *event, String *params, Cardinal *num_params) /* thumbProc is not pretty, but is necessary for backwards compatibility on those architectures for which it work{s,ed}; the intent is to pass a (truncated) float by value. */ - XtCallCallbacks(gw, XtNthumbProc, *(XtPointer*)&w->scrollbar.top); + xtpf.xtf = w->scrollbar.top; + XtCallCallbacks(gw, XtNthumbProc, xtpf.xtp); XtCallCallbacks(gw, XtNjumpProc, (XtPointer)&w->scrollbar.top); PaintThumb(w); diff --git a/xc/lib/Xaw/Scrollbar.h b/xc/lib/Xaw/Scrollbar.h index b67f2fde7..d13d929d9 100644 --- a/xc/lib/Xaw/Scrollbar.h +++ b/xc/lib/Xaw/Scrollbar.h @@ -43,7 +43,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Scrollbar.h,v 1.5 1999/05/03 12:15:42 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Scrollbar.h,v 1.4 1998/10/03 08:42:17 dawes Exp $ */ #ifndef _Scrollbar_h #define _Scrollbar_h diff --git a/xc/lib/Xaw/ScrollbarP.h b/xc/lib/Xaw/ScrollbarP.h index 45a34d618..5a6ad6fc9 100644 --- a/xc/lib/Xaw/ScrollbarP.h +++ b/xc/lib/Xaw/ScrollbarP.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/ScrollbarP.h,v 1.6 1999/06/20 08:41:05 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/ScrollbarP.h,v 1.5 1999/06/06 08:48:08 dawes Exp $ */ #ifndef _ScrollbarP_h #define _ScrollbarP_h diff --git a/xc/lib/Xaw/Simple.c b/xc/lib/Xaw/Simple.c index 66cfa55e0..841cfdb45 100644 --- a/xc/lib/Xaw/Simple.c +++ b/xc/lib/Xaw/Simple.c @@ -43,7 +43,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Simple.c,v 1.14 1999/06/27 14:07:34 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Simple.c,v 1.13 1999/06/20 08:41:05 dawes Exp $ */ #include <stdio.h> #include <X11/IntrinsicP.h> diff --git a/xc/lib/Xaw/Simple.h b/xc/lib/Xaw/Simple.h index 6c1794170..65e294efc 100644 --- a/xc/lib/Xaw/Simple.h +++ b/xc/lib/Xaw/Simple.h @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Simple.h,v 1.7 1999/06/27 14:07:34 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Simple.h,v 1.6 1999/06/06 08:48:09 dawes Exp $ */ #ifndef _Simple_h #define _Simple_h diff --git a/xc/lib/Xaw/SimpleMenP.h b/xc/lib/Xaw/SimpleMenP.h index 058e91952..1dd5d16f0 100644 --- a/xc/lib/Xaw/SimpleMenP.h +++ b/xc/lib/Xaw/SimpleMenP.h @@ -20,7 +20,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. * */ -/* $XFree86: xc/lib/Xaw/SimpleMenP.h,v 1.11 1999/06/20 08:41:05 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/SimpleMenP.h,v 1.10 1999/06/13 13:47:20 dawes Exp $ */ /* * SimpleMenuP.h - Private Header file for SimpleMenu widget. diff --git a/xc/lib/Xaw/SimpleMenu.c b/xc/lib/Xaw/SimpleMenu.c index 500b210bb..b855161b0 100644 --- a/xc/lib/Xaw/SimpleMenu.c +++ b/xc/lib/Xaw/SimpleMenu.c @@ -20,7 +20,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/SimpleMenu.c,v 3.19 1999/07/11 08:49:14 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/SimpleMenu.c,v 3.18 1999/06/20 08:41:06 dawes Exp $ */ /* * SimpleMenu.c - Source code file for SimpleMenu widget. diff --git a/xc/lib/Xaw/SimpleMenu.h b/xc/lib/Xaw/SimpleMenu.h index cf8979ef6..cf13ac0e0 100644 --- a/xc/lib/Xaw/SimpleMenu.h +++ b/xc/lib/Xaw/SimpleMenu.h @@ -21,7 +21,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Chris D. Peterson, MIT X Consortium */ -/* $XFree86: xc/lib/Xaw/SimpleMenu.h,v 1.6 1999/06/13 13:47:21 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/SimpleMenu.h,v 1.5 1998/10/03 08:42:19 dawes Exp $ */ /* * SimpleMenu.h - Public Header file for SimpleMenu widget. diff --git a/xc/lib/Xaw/SimpleP.h b/xc/lib/Xaw/SimpleP.h index 9b6a8c86b..d3c4f3605 100644 --- a/xc/lib/Xaw/SimpleP.h +++ b/xc/lib/Xaw/SimpleP.h @@ -43,7 +43,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/SimpleP.h,v 1.10 1999/06/27 14:07:34 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/SimpleP.h,v 1.9 1999/06/20 08:41:06 dawes Exp $ */ #ifndef _SimpleP_h #define _SimpleP_h diff --git a/xc/lib/Xaw/Sme.c b/xc/lib/Xaw/Sme.c index 118957268..9bc405704 100644 --- a/xc/lib/Xaw/Sme.c +++ b/xc/lib/Xaw/Sme.c @@ -19,7 +19,7 @@ Except as contained in this notice, the name of The Open Group shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/Sme.c,v 1.5 1999/06/06 08:48:10 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Sme.c,v 1.4 1998/10/03 08:42:20 dawes Exp $ */ /* * Date: September 26, 1989 diff --git a/xc/lib/Xaw/Sme.h b/xc/lib/Xaw/Sme.h index c592742dd..2fa9954bc 100644 --- a/xc/lib/Xaw/Sme.h +++ b/xc/lib/Xaw/Sme.h @@ -19,7 +19,7 @@ Except as contained in this notice, the name of The Open Group shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/Sme.h,v 1.4 1998/10/03 08:42:20 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Sme.h,v 1.3 1998/08/20 13:59:11 dawes Exp $ */ /* * This is the public header file for the Athena Sme object. diff --git a/xc/lib/Xaw/SmeBSB.c b/xc/lib/Xaw/SmeBSB.c index f8c65a2df..a5dc305e5 100644 --- a/xc/lib/Xaw/SmeBSB.c +++ b/xc/lib/Xaw/SmeBSB.c @@ -20,7 +20,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/SmeBSB.c,v 1.10 1999/06/06 08:48:11 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/SmeBSB.c,v 1.9 1999/04/25 10:01:25 dawes Exp $ */ /* * SmeBSB.c - Source code file for BSB Menu Entry object. diff --git a/xc/lib/Xaw/SmeBSB.h b/xc/lib/Xaw/SmeBSB.h index 886258085..d0a877097 100644 --- a/xc/lib/Xaw/SmeBSB.h +++ b/xc/lib/Xaw/SmeBSB.h @@ -19,7 +19,7 @@ Except as contained in this notice, the name of The Open Group shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/SmeBSB.h,v 1.5 1999/04/25 10:01:26 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/SmeBSB.h,v 1.4 1998/10/03 08:42:21 dawes Exp $ */ /* * SmeBSB.h - Public Header file for SmeBSB object. diff --git a/xc/lib/Xaw/SmeBSBP.h b/xc/lib/Xaw/SmeBSBP.h index aa2de9f23..3268c641d 100644 --- a/xc/lib/Xaw/SmeBSBP.h +++ b/xc/lib/Xaw/SmeBSBP.h @@ -21,7 +21,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Chris D. Peterson, MIT X Consortium */ -/* $XFree86: xc/lib/Xaw/SmeBSBP.h,v 1.7 1999/06/20 08:41:07 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/SmeBSBP.h,v 1.6 1999/06/06 08:48:11 dawes Exp $ */ #ifndef _XawSmeBSBP_h #define _XawSmeBSBP_h diff --git a/xc/lib/Xaw/SmeLine.c b/xc/lib/Xaw/SmeLine.c index bc7578082..bc3e16346 100644 --- a/xc/lib/Xaw/SmeLine.c +++ b/xc/lib/Xaw/SmeLine.c @@ -21,7 +21,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Chris D. Peterson, MIT X Consortium */ -/* $XFree86: xc/lib/Xaw/SmeLine.c,v 1.6 1999/06/06 08:48:11 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/SmeLine.c,v 1.5 1998/10/03 08:42:21 dawes Exp $ */ /* * Sme.c - Source code for the generic menu entry diff --git a/xc/lib/Xaw/SmeLine.h b/xc/lib/Xaw/SmeLine.h index 10d411c80..c076158cb 100644 --- a/xc/lib/Xaw/SmeLine.h +++ b/xc/lib/Xaw/SmeLine.h @@ -20,7 +20,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. * */ -/* $XFree86: xc/lib/Xaw/SmeLine.h,v 1.4 1998/10/03 08:42:21 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/SmeLine.h,v 1.3 1998/08/20 13:59:12 dawes Exp $ */ /* * This is the public header file for the Athena SmeLine object. diff --git a/xc/lib/Xaw/SmeLineP.h b/xc/lib/Xaw/SmeLineP.h index 50e89768a..d234a0409 100644 --- a/xc/lib/Xaw/SmeLineP.h +++ b/xc/lib/Xaw/SmeLineP.h @@ -21,7 +21,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Chris D. Peterson, MIT X Consortium */ -/* $XFree86: xc/lib/Xaw/SmeLineP.h,v 1.6 1999/06/20 08:41:07 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/SmeLineP.h,v 1.5 1999/06/06 08:48:12 dawes Exp $ */ #ifndef _XawSmeLineP_h #define _XawSmeLineP_h diff --git a/xc/lib/Xaw/SmeP.h b/xc/lib/Xaw/SmeP.h index 798a8f26a..18bc16ce8 100644 --- a/xc/lib/Xaw/SmeP.h +++ b/xc/lib/Xaw/SmeP.h @@ -19,7 +19,7 @@ Except as contained in this notice, the name of The Open Group shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/SmeP.h,v 1.6 1999/06/20 08:41:07 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/SmeP.h,v 1.5 1999/06/06 08:48:12 dawes Exp $ */ /* * This is the private header file for the Athena Sme object. diff --git a/xc/lib/Xaw/StripCharP.h b/xc/lib/Xaw/StripCharP.h index 4aec11ce2..3ac7e662f 100644 --- a/xc/lib/Xaw/StripCharP.h +++ b/xc/lib/Xaw/StripCharP.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/StripCharP.h,v 1.6 1999/06/20 08:41:08 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/StripCharP.h,v 1.5 1999/06/06 08:48:12 dawes Exp $ */ #ifndef _XawStripChartP_h #define _XawStripChartP_h diff --git a/xc/lib/Xaw/StripChart.c b/xc/lib/Xaw/StripChart.c index cee988f44..c2e27ef37 100644 --- a/xc/lib/Xaw/StripChart.c +++ b/xc/lib/Xaw/StripChart.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/StripChart.c,v 1.6 1999/06/06 08:48:12 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/StripChart.c,v 1.5 1999/01/31 12:21:18 dawes Exp $ */ #include <stdio.h> #include <X11/IntrinsicP.h> diff --git a/xc/lib/Xaw/StripChart.h b/xc/lib/Xaw/StripChart.h index 531c43852..faf9afe53 100644 --- a/xc/lib/Xaw/StripChart.h +++ b/xc/lib/Xaw/StripChart.h @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/StripChart.h,v 1.4 1998/10/03 08:42:23 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/StripChart.h,v 1.3 1998/08/20 13:59:13 dawes Exp $ */ #ifndef _XawStripChart_h #define _XawStripChart_h diff --git a/xc/lib/Xaw/Template.c b/xc/lib/Xaw/Template.c index 82fcb9f83..db044bb1b 100644 --- a/xc/lib/Xaw/Template.c +++ b/xc/lib/Xaw/Template.c @@ -21,7 +21,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/Template.c,v 1.6 1999/06/06 08:48:13 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Template.c,v 1.5 1999/03/21 07:34:28 dawes Exp $ */ #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> diff --git a/xc/lib/Xaw/Template.h b/xc/lib/Xaw/Template.h index 3b5281a16..21dc1eec0 100644 --- a/xc/lib/Xaw/Template.h +++ b/xc/lib/Xaw/Template.h @@ -21,7 +21,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/Template.h,v 1.4 1998/10/03 08:42:23 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Template.h,v 1.3 1998/08/20 13:59:14 dawes Exp $ */ #ifndef _Template_h #define _Template_h diff --git a/xc/lib/Xaw/TemplateP.h b/xc/lib/Xaw/TemplateP.h index 8c900ac31..4dd820dc3 100644 --- a/xc/lib/Xaw/TemplateP.h +++ b/xc/lib/Xaw/TemplateP.h @@ -21,7 +21,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/TemplateP.h,v 1.5 1999/06/06 08:48:13 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TemplateP.h,v 1.4 1998/10/03 08:42:24 dawes Exp $ */ #ifndef _TemplateP_h #define _TemplateP_h diff --git a/xc/lib/Xaw/Text.c b/xc/lib/Xaw/Text.c index ee6694405..afee90f71 100644 --- a/xc/lib/Xaw/Text.c +++ b/xc/lib/Xaw/Text.c @@ -70,7 +70,7 @@ SOFTWARE. * XFree86 Project. */ -/* $XFree86: xc/lib/Xaw/Text.c,v 3.35 2000/06/13 23:15:48 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Text.c,v 3.36 2000/08/25 21:51:00 dawes Exp $ */ #include <stdio.h> #include <X11/IntrinsicP.h> @@ -2723,8 +2723,6 @@ DisplayText(Widget w, XawTextPosition left, XawTextPosition right) TextWidget ctx = (TextWidget)w; int y, line; XawTextPosition from, to, lastPos; - XmuScanline *scan; - XmuSegment *seg; Bool cleol = ctx->text.clear_to_eol; Bool has_selection = ctx->text.s.right > ctx->text.s.left; XawTextPaintList *paint_list; @@ -3026,7 +3024,8 @@ _XawTextClearAndCenterDisplay(TextWidget ctx) _XawTextShowPosition(ctx); - if (visible && left_margin == ctx->text.left_margin) { + if (XtIsRealized((Widget)ctx) && visible && + left_margin == ctx->text.left_margin) { int insert_line = LineForPosition(ctx, ctx->text.insertPos); int scroll_by = insert_line - (ctx->text.lt.lines >> 1); Boolean clear_to_eol = ctx->text.clear_to_eol; diff --git a/xc/lib/Xaw/Text.h b/xc/lib/Xaw/Text.h index 7bb3ff0fc..8771ead8a 100644 --- a/xc/lib/Xaw/Text.h +++ b/xc/lib/Xaw/Text.h @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Text.h,v 1.13 1999/08/15 13:00:34 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Text.h,v 1.12 1999/06/06 08:48:14 dawes Exp $ */ #ifndef _XawText_h #define _XawText_h diff --git a/xc/lib/Xaw/TextAction.c b/xc/lib/Xaw/TextAction.c index 5b5683afe..80b1ffa30 100644 --- a/xc/lib/Xaw/TextAction.c +++ b/xc/lib/Xaw/TextAction.c @@ -21,7 +21,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/TextAction.c,v 3.34 1999/09/27 06:29:10 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TextAction.c,v 3.33 1999/08/15 13:00:35 dawes Exp $ */ #include <stdio.h> #include <stdlib.h> diff --git a/xc/lib/Xaw/TextP.h b/xc/lib/Xaw/TextP.h index 3b9e32d30..7b08036c6 100644 --- a/xc/lib/Xaw/TextP.h +++ b/xc/lib/Xaw/TextP.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/TextP.h,v 3.18 1999/06/20 08:41:10 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TextP.h,v 3.17 1999/06/06 08:48:15 dawes Exp $ */ #ifndef _XawTextP_h #define _XawTextP_h diff --git a/xc/lib/Xaw/TextPop.c b/xc/lib/Xaw/TextPop.c index ec49be14e..e90a910a9 100644 --- a/xc/lib/Xaw/TextPop.c +++ b/xc/lib/Xaw/TextPop.c @@ -22,7 +22,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/TextPop.c,v 1.16 2000/05/18 16:29:52 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TextPop.c,v 1.15 1999/08/28 09:00:27 dawes Exp $ */ /* * This file is broken up into three sections one dealing with diff --git a/xc/lib/Xaw/TextSink.c b/xc/lib/Xaw/TextSink.c index d3b8aab9d..71d89d88f 100644 --- a/xc/lib/Xaw/TextSink.c +++ b/xc/lib/Xaw/TextSink.c @@ -20,7 +20,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/TextSink.c,v 1.15 2000/06/15 20:49:58 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TextSink.c,v 1.14 1999/08/28 09:00:27 dawes Exp $ */ /* * Author: Chris Peterson, MIT X Consortium. diff --git a/xc/lib/Xaw/TextSink.h b/xc/lib/Xaw/TextSink.h index 13d026697..1cb71aafe 100644 --- a/xc/lib/Xaw/TextSink.h +++ b/xc/lib/Xaw/TextSink.h @@ -44,7 +44,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/TextSink.h,v 1.8 1999/08/15 13:00:36 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TextSink.h,v 1.7 1999/06/06 08:48:17 dawes Exp $ */ #ifndef _XawTextSink_h #define _XawTextSink_h diff --git a/xc/lib/Xaw/TextSinkP.h b/xc/lib/Xaw/TextSinkP.h index e409721e7..b4a52d836 100644 --- a/xc/lib/Xaw/TextSinkP.h +++ b/xc/lib/Xaw/TextSinkP.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/TextSinkP.h,v 1.10 1999/09/06 13:02:17 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TextSinkP.h,v 1.9 1999/08/28 09:00:28 dawes Exp $ */ #ifndef _XawTextSinkP_h #define _XawTextSinkP_h diff --git a/xc/lib/Xaw/TextSrc.c b/xc/lib/Xaw/TextSrc.c index e3d513376..0d39d0046 100644 --- a/xc/lib/Xaw/TextSrc.c +++ b/xc/lib/Xaw/TextSrc.c @@ -21,7 +21,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/TextSrc.c,v 1.24 2000/03/31 22:55:18 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TextSrc.c,v 1.23 1999/09/27 06:29:11 dawes Exp $ */ /* * Author: Chris Peterson, MIT X Consortium. diff --git a/xc/lib/Xaw/TextSrc.h b/xc/lib/Xaw/TextSrc.h index 26955e934..8e8a9ac6f 100644 --- a/xc/lib/Xaw/TextSrc.h +++ b/xc/lib/Xaw/TextSrc.h @@ -44,7 +44,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/TextSrc.h,v 1.10 1999/08/15 13:00:38 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TextSrc.h,v 1.9 1999/06/06 08:48:18 dawes Exp $ */ #ifndef _XawTextSrc_h #define _XawTextSrc_h diff --git a/xc/lib/Xaw/TextSrcP.h b/xc/lib/Xaw/TextSrcP.h index 25ddb1163..81e2391e1 100644 --- a/xc/lib/Xaw/TextSrcP.h +++ b/xc/lib/Xaw/TextSrcP.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/TextSrcP.h,v 1.12 1999/09/27 06:29:12 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TextSrcP.h,v 1.11 1999/08/28 09:00:29 dawes Exp $ */ #ifndef _XawTextSrcP_h #define _XawTextSrcP_h diff --git a/xc/lib/Xaw/TextTr.c b/xc/lib/Xaw/TextTr.c index c7adda2af..2ed2a60ba 100644 --- a/xc/lib/Xaw/TextTr.c +++ b/xc/lib/Xaw/TextTr.c @@ -21,7 +21,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/TextTr.c,v 3.14 2000/06/13 23:15:48 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TextTr.c,v 3.13 1999/06/06 08:48:18 dawes Exp $ */ /* INTERNATIONALIZATION: diff --git a/xc/lib/Xaw/Tip.c b/xc/lib/Xaw/Tip.c index 761492a56..97c527bd9 100644 --- a/xc/lib/Xaw/Tip.c +++ b/xc/lib/Xaw/Tip.c @@ -27,7 +27,7 @@ * Author: Paulo César Pereira de Andrade */ -/* $XFree86: xc/lib/Xaw/Tip.c,v 1.5 2000/05/18 16:29:53 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Tip.c,v 1.4 1999/07/11 08:49:16 dawes Exp $ */ #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> diff --git a/xc/lib/Xaw/Tip.h b/xc/lib/Xaw/Tip.h index 5fb56f591..0d7121cd3 100644 --- a/xc/lib/Xaw/Tip.h +++ b/xc/lib/Xaw/Tip.h @@ -27,7 +27,7 @@ * Author: Paulo César Pereira de Andrade */ -/* $XFree86: xc/lib/Xaw/Tip.h,v 1.1 1999/06/27 14:07:35 dawes Exp $ */ +/* $XFree86$ */ #ifndef _XawTip_h #define _XawTip_h diff --git a/xc/lib/Xaw/TipP.h b/xc/lib/Xaw/TipP.h index 0c1abc69a..397d24180 100644 --- a/xc/lib/Xaw/TipP.h +++ b/xc/lib/Xaw/TipP.h @@ -27,7 +27,7 @@ * Author: Paulo César Pereira de Andrade */ -/* $XFree86: xc/lib/Xaw/TipP.h,v 1.1 1999/06/27 14:07:35 dawes Exp $ */ +/* $XFree86$ */ #ifndef _XawTipP_h #define _XawTipP_h diff --git a/xc/lib/Xaw/Toggle.c b/xc/lib/Xaw/Toggle.c index 9f3de2d98..a70deb280 100644 --- a/xc/lib/Xaw/Toggle.c +++ b/xc/lib/Xaw/Toggle.c @@ -21,7 +21,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/Toggle.c,v 1.6 1999/06/06 08:48:19 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Toggle.c,v 1.5 1998/10/03 08:42:29 dawes Exp $ */ /* * Author: Chris D. Peterson diff --git a/xc/lib/Xaw/Toggle.h b/xc/lib/Xaw/Toggle.h index 3ef138646..c0f36f086 100644 --- a/xc/lib/Xaw/Toggle.h +++ b/xc/lib/Xaw/Toggle.h @@ -19,7 +19,7 @@ Except as contained in this notice, the name of The Open Group shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/Toggle.h,v 1.4 1998/10/03 08:42:29 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Toggle.h,v 1.3 1998/08/20 13:59:17 dawes Exp $ */ /* * ToggleP.h - Private definitions for Toggle widget diff --git a/xc/lib/Xaw/ToggleP.h b/xc/lib/Xaw/ToggleP.h index 1cc564bc7..8005c606b 100644 --- a/xc/lib/Xaw/ToggleP.h +++ b/xc/lib/Xaw/ToggleP.h @@ -21,7 +21,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/ToggleP.h,v 1.6 1999/06/20 08:41:11 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/ToggleP.h,v 1.5 1999/06/06 08:48:19 dawes Exp $ */ /* * Author: Chris D. Peterson diff --git a/xc/lib/Xaw/Tree.c b/xc/lib/Xaw/Tree.c index 4a9b0ecd4..f528c86d1 100644 --- a/xc/lib/Xaw/Tree.c +++ b/xc/lib/Xaw/Tree.c @@ -44,7 +44,7 @@ in this Software without prior written authorization from The Open Group. * additional blank space to make the structure of the graph easier to see * as well as to support vertical trees. */ -/* $XFree86: xc/lib/Xaw/Tree.c,v 1.8 1999/07/04 06:38:27 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Tree.c,v 1.7 1999/06/13 13:47:24 dawes Exp $ */ #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> diff --git a/xc/lib/Xaw/Tree.h b/xc/lib/Xaw/Tree.h index 5071cfa78..736af7616 100644 --- a/xc/lib/Xaw/Tree.h +++ b/xc/lib/Xaw/Tree.h @@ -44,7 +44,7 @@ in this Software without prior written authorization from The Open Group. * additional blank space to make the structure of the graph easier to see * as well as to support vertical trees. */ -/* $XFree86: xc/lib/Xaw/Tree.h,v 1.5 1999/06/06 08:48:20 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Tree.h,v 1.4 1998/10/03 08:42:30 dawes Exp $ */ #ifndef _XawTree_h diff --git a/xc/lib/Xaw/TreeP.h b/xc/lib/Xaw/TreeP.h index 3e8b14d7a..c6920aebc 100644 --- a/xc/lib/Xaw/TreeP.h +++ b/xc/lib/Xaw/TreeP.h @@ -44,7 +44,7 @@ in this Software without prior written authorization from The Open Group. * additional blank space to make the structure of the graph easier to see * as well as to support vertical trees. */ -/* $XFree86: xc/lib/Xaw/TreeP.h,v 1.5 1999/06/20 08:41:12 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TreeP.h,v 1.4 1999/06/13 13:47:25 dawes Exp $ */ #ifndef _XawTreeP_h diff --git a/xc/lib/Xaw/Vendor.c b/xc/lib/Xaw/Vendor.c index 96d753568..300bc6086 100644 --- a/xc/lib/Xaw/Vendor.c +++ b/xc/lib/Xaw/Vendor.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Vendor.c,v 1.6 1999/03/21 07:34:32 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Vendor.c,v 1.5 1998/10/03 08:42:30 dawes Exp $ */ /* * This is a copy of Xt/Vendor.c with an additional ClassInitialize diff --git a/xc/lib/Xaw/VendorEP.h b/xc/lib/Xaw/VendorEP.h index 309162c16..fd19f5f83 100644 --- a/xc/lib/Xaw/VendorEP.h +++ b/xc/lib/Xaw/VendorEP.h @@ -47,7 +47,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/VendorEP.h,v 1.4 1999/06/20 08:41:12 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/VendorEP.h,v 1.3 1999/06/06 15:35:48 dawes Exp $ */ #ifndef _VendorEP_h #define _VendorEP_h diff --git a/xc/lib/Xaw/Viewport.c b/xc/lib/Xaw/Viewport.c index 24e2fb7cc..9b3fadd73 100644 --- a/xc/lib/Xaw/Viewport.c +++ b/xc/lib/Xaw/Viewport.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Viewport.c,v 1.7 1999/06/06 08:48:21 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Viewport.c,v 1.6 1999/05/03 12:15:46 dawes Exp $ */ #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> diff --git a/xc/lib/Xaw/Viewport.h b/xc/lib/Xaw/Viewport.h index c01e456bf..d57f37fe3 100644 --- a/xc/lib/Xaw/Viewport.h +++ b/xc/lib/Xaw/Viewport.h @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xaw/Viewport.h,v 1.5 1999/05/03 12:15:47 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Viewport.h,v 1.4 1998/10/03 08:42:31 dawes Exp $ */ #ifndef _XawViewport_h #define _XawViewport_h diff --git a/xc/lib/Xaw/ViewportP.h b/xc/lib/Xaw/ViewportP.h index c138822d6..6f1f861d9 100644 --- a/xc/lib/Xaw/ViewportP.h +++ b/xc/lib/Xaw/ViewportP.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xaw/ViewportP.h,v 1.6 1999/06/20 08:41:12 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/ViewportP.h,v 1.5 1999/06/06 08:48:21 dawes Exp $ */ #ifndef _ViewportP_h #define _ViewportP_h diff --git a/xc/lib/Xaw/Xaw.man b/xc/lib/Xaw/Xaw.man index ff21215f8..da52e1c2f 100644 --- a/xc/lib/Xaw/Xaw.man +++ b/xc/lib/Xaw/Xaw.man @@ -26,7 +26,7 @@ .\" .\" Author: Paulo César Pereira de Andrade .\" -.\" $XFree86: xc/lib/Xaw/Xaw.man,v 1.4 1999/06/27 14:07:35 dawes Exp $ +.\" $XFree86: xc/lib/Xaw/Xaw.man,v 1.3 1999/06/20 08:41:13 dawes Exp $ .\" .de TQ .br diff --git a/xc/lib/Xaw/XawI18n.c b/xc/lib/Xaw/XawI18n.c index 5fdd0a3c5..70d5d8dcc 100644 --- a/xc/lib/Xaw/XawI18n.c +++ b/xc/lib/Xaw/XawI18n.c @@ -49,7 +49,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/XawI18n.c,v 1.6 1999/07/19 13:36:04 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/XawI18n.c,v 1.5 1999/05/03 12:15:47 dawes Exp $ */ #include <X11/IntrinsicP.h> #include "XawI18n.h" diff --git a/xc/lib/Xaw/XawI18n.h b/xc/lib/Xaw/XawI18n.h index d5ae88722..824e869b9 100644 --- a/xc/lib/Xaw/XawI18n.h +++ b/xc/lib/Xaw/XawI18n.h @@ -21,7 +21,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. ********************************************************/ -/* $XFree86: xc/lib/Xaw/XawI18n.h,v 3.10 1999/12/27 00:39:23 robin Exp $ */ +/* $XFree86: xc/lib/Xaw/XawI18n.h,v 3.9 1999/07/19 13:36:04 dawes Exp $ */ #ifdef HAS_WCTYPE_H #include <wctype.h> diff --git a/xc/lib/Xaw/XawIm.c b/xc/lib/Xaw/XawIm.c index fa1d11195..9225c3e68 100644 --- a/xc/lib/Xaw/XawIm.c +++ b/xc/lib/Xaw/XawIm.c @@ -88,8 +88,6 @@ in this Software without prior written authorization from The Open Group. * *****************************************************/ -#define SetVaArg(arg, value) (*((XtPointer *)arg) = (XtPointer)(value)) - /* * Prototypes */ @@ -724,15 +722,15 @@ SizeNegotiation(XawIcTableList p, unsigned int width, unsigned int height) if (p->input_style & XIMPreeditArea) { pe_attr = XVaCreateNestedList(0, XNAreaNeeded, &pe_area_needed, NULL); - SetVaArg( &ic_a[ic_cnt], (XPointer) XNPreeditAttributes); ic_cnt++; - SetVaArg( &ic_a[ic_cnt], (XPointer) pe_attr); ic_cnt++; + ic_a[ic_cnt] = (XPointer) XNPreeditAttributes; ic_cnt++; + ic_a[ic_cnt] = (XPointer) pe_attr; ic_cnt++; } if (p->input_style & XIMStatusArea) { st_attr = XVaCreateNestedList(0, XNAreaNeeded, &st_area_needed, NULL); - SetVaArg( &ic_a[ic_cnt], (XPointer) XNStatusAttributes); ic_cnt++; - SetVaArg( &ic_a[ic_cnt], (XPointer) st_attr); ic_cnt++; + ic_a[ic_cnt] = (XPointer) XNStatusAttributes; ic_cnt++; + ic_a[ic_cnt] = (XPointer) st_attr; ic_cnt++; } - SetVaArg( &ic_a[ic_cnt], (XPointer) NULL); + ic_a[ic_cnt] = (XPointer) NULL; if (ic_cnt > 0) { XGetICValues(p->xic, ic_a[0], ic_a[1], ic_a[2], ic_a[3], ic_a[4]); @@ -756,8 +754,8 @@ SizeNegotiation(XawIcTableList p, unsigned int width, unsigned int height) XFree(st_area_needed); st_attr = XVaCreateNestedList(0, XNArea, &st_area, NULL); - SetVaArg( &ic_a[ic_cnt], (XPointer) XNStatusAttributes); ic_cnt++; - SetVaArg( &ic_a[ic_cnt], (XPointer) st_attr); ic_cnt++; + ic_a[ic_cnt] = (XPointer) XNStatusAttributes; ic_cnt++; + ic_a[ic_cnt] = (XPointer) st_attr; ic_cnt++; } if (p->input_style & XIMPreeditArea) { if (p->input_style & XIMStatusArea) { @@ -771,10 +769,10 @@ SizeNegotiation(XawIcTableList p, unsigned int width, unsigned int height) XFree(pe_area_needed); pe_area.y = height - pe_area.height; pe_attr = XVaCreateNestedList(0, XNArea, &pe_area, NULL); - SetVaArg( &ic_a[ic_cnt], (XPointer) XNPreeditAttributes); ic_cnt++; - SetVaArg( &ic_a[ic_cnt], (XPointer) pe_attr); ic_cnt++; + ic_a[ic_cnt] = (XPointer) XNPreeditAttributes; ic_cnt++; + ic_a[ic_cnt] = (XPointer) pe_attr; ic_cnt++; } - SetVaArg( &ic_a[ic_cnt], (XPointer) NULL); + ic_a[ic_cnt] = (XPointer) NULL; XSetICValues(p->xic, ic_a[0], ic_a[1], ic_a[2], ic_a[3], ic_a[4]); if (pe_attr) XFree(pe_attr); if (st_attr) XFree(st_attr); @@ -808,37 +806,37 @@ CreateIC(Widget w, XawVendorShellExtPart *ve) if (p->input_style & (XIMPreeditArea|XIMPreeditPosition|XIMStatusArea)) { if (p->flg & CIFontSet) { - SetVaArg( &pe_a[pe_cnt], (XPointer) XNFontSet); pe_cnt++; - SetVaArg( &pe_a[pe_cnt], (XPointer) p->font_set); pe_cnt++; - SetVaArg( &st_a[st_cnt], (XPointer) XNFontSet); st_cnt++; - SetVaArg( &st_a[st_cnt], (XPointer) p->font_set); st_cnt++; + pe_a[pe_cnt] = (XPointer) XNFontSet; pe_cnt++; + pe_a[pe_cnt] = (XPointer) p->font_set; pe_cnt++; + st_a[st_cnt] = (XPointer) XNFontSet; st_cnt++; + st_a[st_cnt] = (XPointer) p->font_set; st_cnt++; height = maxAscentOfFontSet(p->font_set) + maxDescentOfFontSet(p->font_set); height = SetVendorShellHeight(ve, height); } if (p->flg & CIFg) { - SetVaArg( &pe_a[pe_cnt], (XPointer) XNForeground); pe_cnt++; - SetVaArg( &pe_a[pe_cnt], (XPointer) p->foreground); pe_cnt++; - SetVaArg( &st_a[st_cnt], (XPointer) XNForeground); st_cnt++; - SetVaArg( &st_a[st_cnt], (XPointer) p->foreground); st_cnt++; + pe_a[pe_cnt] = (XPointer) XNForeground; pe_cnt++; + pe_a[pe_cnt] = (XPointer) p->foreground; pe_cnt++; + st_a[st_cnt] = (XPointer) XNForeground; st_cnt++; + st_a[st_cnt] = (XPointer) p->foreground; st_cnt++; } if (p->flg & CIBg) { - SetVaArg( &pe_a[pe_cnt], (XPointer) XNBackground); pe_cnt++; - SetVaArg( &pe_a[pe_cnt], (XPointer) p->background); pe_cnt++; - SetVaArg( &st_a[st_cnt], (XPointer) XNBackground); st_cnt++; - SetVaArg( &st_a[st_cnt], (XPointer) p->background); st_cnt++; + pe_a[pe_cnt] = (XPointer) XNBackground; pe_cnt++; + pe_a[pe_cnt] = (XPointer) p->background; pe_cnt++; + st_a[st_cnt] = (XPointer) XNBackground; st_cnt++; + st_a[st_cnt] = (XPointer) p->background; st_cnt++; } if (p->flg & CIBgPixmap) { - SetVaArg( &pe_a[pe_cnt], (XPointer) XNBackgroundPixmap); pe_cnt++; - SetVaArg( &pe_a[pe_cnt], (XPointer) p->bg_pixmap); pe_cnt++; - SetVaArg( &st_a[st_cnt], (XPointer) XNBackgroundPixmap); st_cnt++; - SetVaArg( &st_a[st_cnt], (XPointer) p->bg_pixmap); st_cnt++; + pe_a[pe_cnt] = (XPointer) XNBackgroundPixmap; pe_cnt++; + pe_a[pe_cnt] = (XPointer) p->bg_pixmap; pe_cnt++; + st_a[st_cnt] = (XPointer) XNBackgroundPixmap; st_cnt++; + st_a[st_cnt] = (XPointer) p->bg_pixmap; st_cnt++; } if (p->flg & CILineS) { - SetVaArg( &pe_a[pe_cnt], (XPointer) XNLineSpace); pe_cnt++; - SetVaArg( &pe_a[pe_cnt], (XPointer) p->line_spacing); pe_cnt++; - SetVaArg( &st_a[st_cnt], (XPointer) XNLineSpace); st_cnt++; - SetVaArg( &st_a[st_cnt], (XPointer) p->line_spacing); st_cnt++; + pe_a[pe_cnt] = (XPointer) XNLineSpace; pe_cnt++; + pe_a[pe_cnt] = (XPointer) p->line_spacing; pe_cnt++; + st_a[st_cnt] = (XPointer) XNLineSpace; st_cnt++; + st_a[st_cnt] = (XPointer) p->line_spacing; st_cnt++; } } if (p->input_style & XIMPreeditArea) { @@ -846,8 +844,8 @@ CreateIC(Widget w, XawVendorShellExtPart *ve) pe_area.y = ve->parent->core.height - height; pe_area.width = ve->parent->core.width; pe_area.height = height; - SetVaArg( &pe_a[pe_cnt], (XPointer) XNArea); pe_cnt++; - SetVaArg( &pe_a[pe_cnt], (XPointer) &pe_area); pe_cnt++; + pe_a[pe_cnt] = (XPointer) XNArea; pe_cnt++; + pe_a[pe_cnt] = (XPointer) &pe_area; pe_cnt++; } if (p->input_style & XIMPreeditPosition) { pe_area.x = 0; @@ -859,54 +857,54 @@ CreateIC(Widget w, XawVendorShellExtPart *ve) pe_area.y += margin->top; pe_area.width -= (margin->left + margin->right - 1); pe_area.height -= (margin->top + margin->bottom - 1); - SetVaArg( &pe_a[pe_cnt], (XPointer) XNArea); pe_cnt++; - SetVaArg( &pe_a[pe_cnt], (XPointer) &pe_area); pe_cnt++; + pe_a[pe_cnt] = (XPointer) XNArea; pe_cnt++; + pe_a[pe_cnt] = (XPointer) &pe_area; pe_cnt++; if (p->flg & CICursorP) { _XawMultiSinkPosToXY(w, p->cursor_position, &position.x, &position.y); } else { position.x = position.y = 0; } - SetVaArg( &pe_a[pe_cnt], (XPointer) XNSpotLocation); pe_cnt++; - SetVaArg( &pe_a[pe_cnt], (XPointer) &position); pe_cnt++; + pe_a[pe_cnt] = (XPointer) XNSpotLocation; pe_cnt++; + pe_a[pe_cnt] = (XPointer) &position; pe_cnt++; } if (p->input_style & XIMStatusArea) { st_area.x = 0; st_area.y = ve->parent->core.height - height; st_area.width = ve->parent->core.width; st_area.height = height; - SetVaArg( &st_a[st_cnt], (XPointer) XNArea); st_cnt++; - SetVaArg( &st_a[st_cnt], (XPointer) &st_area); st_cnt++; + st_a[st_cnt] = (XPointer) XNArea; st_cnt++; + st_a[st_cnt] = (XPointer) &st_area; st_cnt++; } - SetVaArg( &ic_a[ic_cnt], (XPointer) XNInputStyle); ic_cnt++; - SetVaArg( &ic_a[ic_cnt], (XPointer) p->input_style); ic_cnt++; - SetVaArg( &ic_a[ic_cnt], (XPointer) XNClientWindow); ic_cnt++; - SetVaArg( &ic_a[ic_cnt], (XPointer) XtWindow(ve->parent)); ic_cnt++; - SetVaArg( &ic_a[ic_cnt], (XPointer) XNFocusWindow); ic_cnt++; - SetVaArg( &ic_a[ic_cnt], (XPointer) XtWindow(w)); ic_cnt++; + ic_a[ic_cnt] = (XPointer) XNInputStyle; ic_cnt++; + ic_a[ic_cnt] = (XPointer) p->input_style; ic_cnt++; + ic_a[ic_cnt] = (XPointer) XNClientWindow; ic_cnt++; + ic_a[ic_cnt] = (XPointer) XtWindow(ve->parent); ic_cnt++; + ic_a[ic_cnt] = (XPointer) XNFocusWindow; ic_cnt++; + ic_a[ic_cnt] = (XPointer) XtWindow(w); ic_cnt++; if (pe_cnt > 0) { - SetVaArg( &pe_a[pe_cnt], (XPointer) NULL); + pe_a[pe_cnt] = (XPointer) NULL; pe_attr = XVaCreateNestedList(0, pe_a[0], pe_a[1], pe_a[2], pe_a[3], pe_a[4], pe_a[5], pe_a[6], pe_a[7], pe_a[8], pe_a[9], pe_a[10], pe_a[11], pe_a[12], pe_a[13], pe_a[14], pe_a[15], pe_a[16], pe_a[17], pe_a[18], pe_a[19]); - SetVaArg( &ic_a[ic_cnt], (XPointer) XNPreeditAttributes); ic_cnt++; - SetVaArg( &ic_a[ic_cnt], (XPointer) pe_attr); ic_cnt++; + ic_a[ic_cnt] = (XPointer) XNPreeditAttributes; ic_cnt++; + ic_a[ic_cnt] = (XPointer) pe_attr; ic_cnt++; } if (st_cnt > 0) { - SetVaArg( &st_a[st_cnt], (XPointer) NULL); + st_a[st_cnt] = (XPointer) NULL; st_attr = XVaCreateNestedList(0, st_a[0], st_a[1], st_a[2], st_a[3], st_a[4], st_a[5], st_a[6], st_a[7], st_a[8], st_a[9], st_a[10], st_a[11], st_a[12], st_a[13], st_a[14], st_a[15], st_a[16], st_a[17], st_a[18], st_a[19]); - SetVaArg( &ic_a[ic_cnt], (XPointer) XNStatusAttributes); ic_cnt++; - SetVaArg( &ic_a[ic_cnt], (XPointer) st_attr); ic_cnt++; + ic_a[ic_cnt] = (XPointer) XNStatusAttributes; ic_cnt++; + ic_a[ic_cnt] = (XPointer) st_attr; ic_cnt++; } - SetVaArg( &ic_a[ic_cnt], (XPointer) NULL); + ic_a[ic_cnt] = (XPointer) NULL; p->xic = XCreateIC(ve->im.xim, ic_a[0], ic_a[1], ic_a[2], ic_a[3], ic_a[4], ic_a[5], ic_a[6], ic_a[7], ic_a[8], ic_a[9], @@ -965,44 +963,44 @@ SetICValues(Widget w, XawVendorShellExtPart *ve, Bool focus) if (p->input_style & (XIMPreeditArea|XIMPreeditPosition|XIMStatusArea)) { if (p->flg & CIFontSet) { - SetVaArg( &pe_a[pe_cnt], (XPointer) XNFontSet); pe_cnt++; - SetVaArg( &pe_a[pe_cnt], (XPointer) p->font_set); pe_cnt++; - SetVaArg( &st_a[st_cnt], (XPointer) XNFontSet); st_cnt++; - SetVaArg( &st_a[st_cnt], (XPointer) p->font_set); st_cnt++; + pe_a[pe_cnt] = (XPointer) XNFontSet; pe_cnt++; + pe_a[pe_cnt] = (XPointer) p->font_set; pe_cnt++; + st_a[st_cnt] = (XPointer) XNFontSet; st_cnt++; + st_a[st_cnt] = (XPointer) p->font_set; st_cnt++; height = maxAscentOfFontSet(p->font_set) + maxDescentOfFontSet(p->font_set); height = SetVendorShellHeight(ve, height); } if (p->flg & CIFg) { - SetVaArg( &pe_a[pe_cnt], (XPointer) XNForeground); pe_cnt++; - SetVaArg( &pe_a[pe_cnt], (XPointer) p->foreground); pe_cnt++; - SetVaArg( &st_a[st_cnt], (XPointer) XNForeground); st_cnt++; - SetVaArg( &st_a[st_cnt], (XPointer) p->foreground); st_cnt++; + pe_a[pe_cnt] = (XPointer) XNForeground; pe_cnt++; + pe_a[pe_cnt] = (XPointer) p->foreground; pe_cnt++; + st_a[st_cnt] = (XPointer) XNForeground; st_cnt++; + st_a[st_cnt] = (XPointer) p->foreground; st_cnt++; } if (p->flg & CIBg) { - SetVaArg( &pe_a[pe_cnt], (XPointer) XNBackground); pe_cnt++; - SetVaArg( &pe_a[pe_cnt], (XPointer) p->background); pe_cnt++; - SetVaArg( &st_a[st_cnt], (XPointer) XNBackground); st_cnt++; - SetVaArg( &st_a[st_cnt], (XPointer) p->background); st_cnt++; + pe_a[pe_cnt] = (XPointer) XNBackground; pe_cnt++; + pe_a[pe_cnt] = (XPointer) p->background; pe_cnt++; + st_a[st_cnt] = (XPointer) XNBackground; st_cnt++; + st_a[st_cnt] = (XPointer) p->background; st_cnt++; } if (p->flg & CIBgPixmap) { - SetVaArg( &pe_a[pe_cnt], (XPointer) XNBackgroundPixmap); pe_cnt++; - SetVaArg( &pe_a[pe_cnt], (XPointer) p->bg_pixmap); pe_cnt++; - SetVaArg( &st_a[st_cnt], (XPointer) XNBackgroundPixmap); st_cnt++; - SetVaArg( &st_a[st_cnt], (XPointer) p->bg_pixmap); st_cnt++; + pe_a[pe_cnt] = (XPointer) XNBackgroundPixmap; pe_cnt++; + pe_a[pe_cnt] = (XPointer) p->bg_pixmap; pe_cnt++; + st_a[st_cnt] = (XPointer) XNBackgroundPixmap; st_cnt++; + st_a[st_cnt] = (XPointer) p->bg_pixmap; st_cnt++; } if (p->flg & CILineS) { - SetVaArg( &pe_a[pe_cnt], (XPointer) XNLineSpace); pe_cnt++; - SetVaArg( &pe_a[pe_cnt], (XPointer) p->line_spacing); pe_cnt++; - SetVaArg( &st_a[st_cnt], (XPointer) XNLineSpace); st_cnt++; - SetVaArg( &st_a[st_cnt], (XPointer) p->line_spacing); st_cnt++; + pe_a[pe_cnt] = (XPointer) XNLineSpace; pe_cnt++; + pe_a[pe_cnt] = (XPointer) p->line_spacing; pe_cnt++; + st_a[st_cnt] = (XPointer) XNLineSpace; st_cnt++; + st_a[st_cnt] = (XPointer) p->line_spacing; st_cnt++; } } if (p->input_style & XIMPreeditPosition) { if (p->flg & CICursorP) { _XawMultiSinkPosToXY(w, p->cursor_position, &position.x, &position.y); - SetVaArg( &pe_a[pe_cnt], (XPointer) XNSpotLocation); pe_cnt++; - SetVaArg( &pe_a[pe_cnt], (XPointer) &position); pe_cnt++; + pe_a[pe_cnt] = (XPointer) XNSpotLocation; pe_cnt++; + pe_a[pe_cnt] = (XPointer) &position; pe_cnt++; } } if (IsSharedIC(ve)) { @@ -1016,37 +1014,37 @@ SetICValues(Widget w, XawVendorShellExtPart *ve, Bool focus) pe_area.y += margin->top; pe_area.width -= (margin->left + margin->right - 1); pe_area.height -= (margin->top + margin->bottom - 1); - SetVaArg( &pe_a[pe_cnt], (XPointer) XNArea); pe_cnt++; - SetVaArg( &pe_a[pe_cnt], (XPointer) &pe_area); pe_cnt++; + pe_a[pe_cnt] = (XPointer) XNArea; pe_cnt++; + pe_a[pe_cnt] = (XPointer) &pe_area; pe_cnt++; } } if (pe_cnt > 0) { - SetVaArg( &pe_a[pe_cnt], (XPointer) NULL); + pe_a[pe_cnt] = (XPointer) NULL; pe_attr = XVaCreateNestedList(0, pe_a[0], pe_a[1], pe_a[2], pe_a[3], pe_a[4], pe_a[5], pe_a[6], pe_a[7], pe_a[8], pe_a[9], pe_a[10], pe_a[11], pe_a[12], pe_a[13], pe_a[14], pe_a[15], pe_a[16], pe_a[17], pe_a[18], pe_a[19]); - SetVaArg( &ic_a[ic_cnt], (XPointer) XNPreeditAttributes); ic_cnt++; - SetVaArg( &ic_a[ic_cnt], (XPointer) pe_attr); ic_cnt++; + ic_a[ic_cnt] = (XPointer) XNPreeditAttributes; ic_cnt++; + ic_a[ic_cnt] = (XPointer) pe_attr; ic_cnt++; } if (st_cnt > 0) { - SetVaArg( &st_a[st_cnt], (XPointer) NULL); + st_a[st_cnt] = (XPointer) NULL; st_attr = XVaCreateNestedList(0, st_a[0], st_a[1], st_a[2], st_a[3], st_a[4], st_a[5], st_a[6], st_a[7], st_a[8], st_a[9], st_a[10], st_a[11], st_a[12], st_a[13], st_a[14], st_a[15], st_a[16], st_a[17], st_a[18], st_a[19]); - SetVaArg( &ic_a[ic_cnt], (XPointer) XNStatusAttributes); ic_cnt++; - SetVaArg( &ic_a[ic_cnt], (XPointer) st_attr); ic_cnt++; + ic_a[ic_cnt] = (XPointer) XNStatusAttributes; ic_cnt++; + ic_a[ic_cnt] = (XPointer) st_attr; ic_cnt++; } if (focus == TRUE) { - SetVaArg( &ic_a[ic_cnt], (XPointer) XNFocusWindow); ic_cnt++; - SetVaArg( &ic_a[ic_cnt], (XPointer) XtWindow(w)); ic_cnt++; + ic_a[ic_cnt] = (XPointer) XNFocusWindow; ic_cnt++; + ic_a[ic_cnt] = (XPointer) XtWindow(w); ic_cnt++; } if (ic_cnt > 0) { - SetVaArg( &ic_a[ic_cnt], (XPointer) NULL); + ic_a[ic_cnt] = (XPointer) NULL; XSetICValues(p->xic, ic_a[0], ic_a[1], ic_a[2], ic_a[3], ic_a[4], ic_a[5], ic_a[6], ic_a[7], ic_a[8], ic_a[9], ic_a[10], ic_a[11], ic_a[12], ic_a[13], ic_a[14], ic_a[15], diff --git a/xc/lib/Xaw/XawImP.h b/xc/lib/Xaw/XawImP.h index ae6901cc6..a3e5854ec 100644 --- a/xc/lib/Xaw/XawImP.h +++ b/xc/lib/Xaw/XawImP.h @@ -47,7 +47,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/XawImP.h,v 3.7 1999/03/14 11:17:41 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/XawImP.h,v 3.6 1999/03/14 03:21:13 dawes Exp $ */ #ifndef _XawImP_h #define _XawImP_h diff --git a/xc/lib/Xaw/XawInit.c b/xc/lib/Xaw/XawInit.c index 7b8a55251..5ff0a08aa 100644 --- a/xc/lib/Xaw/XawInit.c +++ b/xc/lib/Xaw/XawInit.c @@ -28,7 +28,7 @@ in this Software without prior written authorization from The Open Group. * call this routine from their ClassInitialize procs (this routine may be * used as the class init proc). */ -/* $XFree86: xc/lib/Xaw/XawInit.c,v 1.8 1999/06/06 08:48:22 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/XawInit.c,v 1.7 1998/10/03 08:42:33 dawes Exp $ */ #include <X11/Intrinsic.h> #include <X11/Vendor.h> diff --git a/xc/lib/Xaw/XawInit.h b/xc/lib/Xaw/XawInit.h index b58996a47..469ddd245 100644 --- a/xc/lib/Xaw/XawInit.h +++ b/xc/lib/Xaw/XawInit.h @@ -18,7 +18,7 @@ Except as contained in this notice, the name of The Open Group shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/XawInit.h,v 1.11 1999/08/28 09:00:29 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/XawInit.h,v 1.10 1999/08/15 13:00:39 dawes Exp $ */ #ifndef _XawInit_h #define _XawInit_h diff --git a/xc/lib/Xaw/Xawos2.def b/xc/lib/Xaw/Xawos2.def index d62f79705..cafc5067a 100644 --- a/xc/lib/Xaw/Xawos2.def +++ b/xc/lib/Xaw/Xawos2.def @@ -1,5 +1,5 @@ LIBRARY Xaw INITINSTANCE TERMINSTANCE -DESCRIPTION "@#XFREE86:4.0#@ $XFree86: xc/lib/Xaw/Xawos2.def,v 3.8 2000/04/05 18:13:17 dawes Exp $" +DESCRIPTION "@#XFREE86:4.0#@ $XFree86: xc/lib/Xaw/Xawos2.def,v 3.7 1999/04/29 09:13:30 dawes Exp $" CODE PRELOAD DATA diff --git a/xc/lib/Xaw/jump_funcs b/xc/lib/Xaw/jump_funcs index df6d0e529..775a88e14 100644 --- a/xc/lib/Xaw/jump_funcs +++ b/xc/lib/Xaw/jump_funcs @@ -1,5 +1,5 @@ # $XConsortium: jump_funcs,v 1.2 94/12/07 10:46:47 kaleb Exp $ -# $XFree86: xc/lib/Xaw/jump_funcs,v 3.2 1996/02/12 11:11:15 dawes Exp $ +# $XFree86: xc/lib/Xaw/jump_funcs,v 3.1 1995/01/28 15:43:31 dawes Exp $ # 00000000 T _XawAsciiSourceFreeString libXaw AsciiSrc 00000000 T _XawAsciiSave libXaw AsciiSrc diff --git a/xc/lib/Xaw/jump_ignore b/xc/lib/Xaw/jump_ignore index 253b63da1..cf0567d46 100644 --- a/xc/lib/Xaw/jump_ignore +++ b/xc/lib/Xaw/jump_ignore @@ -1,3 +1,3 @@ # $XConsortium: jump_ignore,v 1.2 94/12/07 10:46:47 kaleb Exp $ -# $XFree86: xc/lib/Xaw/jump_ignore,v 3.1 1995/01/28 15:43:32 dawes Exp $ +# $XFree86: xc/lib/Xaw/jump_ignore,v 3.0 1994/04/28 12:31:53 dawes Exp $ # jump_ignore diff --git a/xc/lib/Xaw/jump_vars b/xc/lib/Xaw/jump_vars index 2edecda2e..3d7372b64 100644 --- a/xc/lib/Xaw/jump_vars +++ b/xc/lib/Xaw/jump_vars @@ -1,5 +1,5 @@ # $XConsortium: jump_vars,v 1.2 94/12/07 10:46:47 kaleb Exp $ -# $XFree86: xc/lib/Xaw/jump_vars,v 3.1 1995/01/28 15:43:33 dawes Exp $ +# $XFree86: xc/lib/Xaw/jump_vars,v 3.0 1994/04/28 12:31:54 dawes Exp $ # 00001400 D _XawWidgetArray libXaw AllWidgets 00000004 D _XawWidgetCount libXaw AllWidgets |