diff options
| author | marha <marha@users.sourceforge.net> | 2012-04-10 15:05:45 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-04-10 15:05:45 +0200 |
| commit | 4b35ef19b76849cbd854c3b6f92bbc1c2d50f2d8 (patch) | |
| tree | 3ddf28be6916dd5ea27837431b5be8c94017cd9a /libXaw/src/Simple.c | |
| parent | 5564e91e3cf4ba5cb2fbebbc2d63d18f588016b8 (diff) | |
| parent | 5f8448ef6b85a9ff72c5af4cec99183c8bb60dc6 (diff) | |
| download | vcxsrv-4b35ef19b76849cbd854c3b6f92bbc1c2d50f2d8.tar.gz vcxsrv-4b35ef19b76849cbd854c3b6f92bbc1c2d50f2d8.tar.bz2 vcxsrv-4b35ef19b76849cbd854c3b6f92bbc1c2d50f2d8.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'libXaw/src/Simple.c')
| -rw-r--r-- | libXaw/src/Simple.c | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/libXaw/src/Simple.c b/libXaw/src/Simple.c index 711e9007a..be5597b2b 100644 --- a/libXaw/src/Simple.c +++ b/libXaw/src/Simple.c @@ -27,13 +27,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -52,7 +52,6 @@ SOFTWARE. #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> #include <X11/Xmu/Drawing.h> -#include <X11/Xmu/SysUtil.h> #include <X11/Xaw/SimpleP.h> #include <X11/Xaw/XawInit.h> #include "Private.h" @@ -271,11 +270,11 @@ XawSimpleClassPartInitialize(WidgetClass cclass) if (c->simple_class.change_sensitive == NULL) { char buf[BUFSIZ]; - (void)XmuSnprintf(buf, sizeof(buf), - "%s Widget: The Simple Widget class method " - "'change_sensitive' is undefined.\nA function " - "must be defined or inherited.", - c->core_class.class_name); + snprintf(buf, sizeof(buf), + "%s Widget: The Simple Widget class method " + "'change_sensitive' is undefined.\n" + "A function must be defined or inherited.", + c->core_class.class_name); XtWarning(buf); c->simple_class.change_sensitive = ChangeSensitive; } @@ -321,7 +320,7 @@ XawSimpleRealize(Widget w, Mask *valueMask, XSetWindowAttributes *attributes) if (((SimpleWidget)w)->simple.insensitive_border == None) ((SimpleWidget)w)->simple.insensitive_border = XmuCreateStippledPixmap(XtScreen(w), - w->core.border_pixel, + w->core.border_pixel, w->core.background_pixel, w->core.depth); border_pixmap = w->core.border_pixmap; @@ -372,7 +371,7 @@ ConvertCursor(Widget w) SimpleWidget simple = (SimpleWidget) w; XrmValue from, to; Cursor cursor = None; - + if (simple->simple.cursor_name == NULL) return; @@ -410,7 +409,7 @@ XawSimpleSetValues(Widget current, Widget request, Widget cnew, if (s_old->simple.cursor != s_new->simple.cursor) new_cursor = True; - + /* * We are not handling the string cursor_name correctly here */ @@ -488,7 +487,7 @@ ChangeSensitive(Widget w) if (((SimpleWidget)w)->simple.insensitive_border == None) ((SimpleWidget)w)->simple.insensitive_border = XmuCreateStippledPixmap(XtScreen(w), - w->core.border_pixel, + w->core.border_pixel, w->core.background_pixel, w->core.depth); XSetWindowBorderPixmap(XtDisplay(w), XtWindow(w), |