aboutsummaryrefslogtreecommitdiff
path: root/libXaw/src/Simple.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-04-10 14:58:33 +0200
committermarha <marha@users.sourceforge.net>2012-04-10 14:58:33 +0200
commit5f8448ef6b85a9ff72c5af4cec99183c8bb60dc6 (patch)
treec10939819ba1167cdc905a0c105c7ae4091abbc3 /libXaw/src/Simple.c
parent67326634496ef21b4acbf4cef2f05040d34aef9b (diff)
downloadvcxsrv-5f8448ef6b85a9ff72c5af4cec99183c8bb60dc6.tar.gz
vcxsrv-5f8448ef6b85a9ff72c5af4cec99183c8bb60dc6.tar.bz2
vcxsrv-5f8448ef6b85a9ff72c5af4cec99183c8bb60dc6.zip
Updated following packages:
bigreqsproto-1.1.2 fontsproto-2.1.2 recordproto-1.14.2 scrnsaverproto-1.2.2 xcmiscproto-1.2.2 libXt-1.1.3 xhost-1.0.5 kbproto-1.0.6 libXrender-0.9.7 libxkbfile-1.0.8 freetype-2.4.9 libXaw-1.0.10 libXpm-3.5.10 xproto-7.0.23
Diffstat (limited to 'libXaw/src/Simple.c')
-rw-r--r--libXaw/src/Simple.c27
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),