summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--generic/tkCanvas.c18
-rw-r--r--mac/tkMacXStubs.c73
2 files changed, 46 insertions, 45 deletions
diff --git a/generic/tkCanvas.c b/generic/tkCanvas.c
index 0446d0c..76e3da5 100644
--- a/generic/tkCanvas.c
+++ b/generic/tkCanvas.c
@@ -12,7 +12,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkCanvas.c,v 1.9 1999/12/14 06:52:26 hobbs Exp $
+ * RCS: @(#) $Id: tkCanvas.c,v 1.10 1999/12/22 03:09:55 hobbs Exp $
*/
/* #define USE_OLD_TAG_SEARCH 1 */
@@ -726,13 +726,14 @@ CanvasWidgetCmd(clientData, interp, argc, argv)
TagSearchExpr *expr, **lastPtr;
lastPtr = &(canvasPtr->bindTagExprs);
- while ((expr = *lastPtr)) {
- if (expr->uid == searchPtr->expr->uid)
+ while ((expr = *lastPtr) != NULL) {
+ if (expr->uid == searchPtr->expr->uid) {
break;
- lastPtr = &(expr->next);
}
+ lastPtr = &(expr->next);
+ }
if (!expr) {
- /*
+ /*
* transfer ownership of expr to bindTagExprs list
*/
*lastPtr = searchPtr->expr;
@@ -741,8 +742,8 @@ CanvasWidgetCmd(clientData, interp, argc, argv)
/*
* flag in TagSearch that expr has changed ownership
* so that TagSearchDestroy doesn't try to free it
- */
- searchPtr->expr = NULL;
+ */
+ searchPtr->expr = NULL;
}
}
#endif /* not USE_OLD_TAG_SEARCH */
@@ -4898,7 +4899,8 @@ CanvasDoEvent(canvasPtr, eventPtr)
expr = canvasPtr->bindTagExprs;
while (expr) {
expr->index = 0;
- if ((expr->match = TagSearchEvalExpr(expr, itemPtr))) {
+ expr->match = TagSearchEvalExpr(expr, itemPtr);
+ if (expr->match) {
numExprs++;
}
expr = expr->next;
diff --git a/mac/tkMacXStubs.c b/mac/tkMacXStubs.c
index a555ecf..757842e 100644
--- a/mac/tkMacXStubs.c
+++ b/mac/tkMacXStubs.c
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacXStubs.c,v 1.8 1999/12/14 06:52:56 hobbs Exp $
+ * RCS: @(#) $Id: tkMacXStubs.c,v 1.9 1999/12/22 03:09:59 hobbs Exp $
*/
#include "tkInt.h"
@@ -464,62 +464,61 @@ XSendEvent(
}
void
-XClearWindow(display, w)
- Display* display;
- Window w;
+XClearWindow(
+ Display* display,
+ Window w)
{
}
void
-XDrawPoint(display, d, gc, x, y)
- Display* display;
- Drawable d;
- GC gc;
- int x;
- int y;
+XDrawPoint(
+ Display* display,
+ Drawable d,
+ GC gc,
+ int x,
+ int y)
{
}
void
-XDrawPoints(display, d, gc, points, npoints, mode)
- Display* display;
- Drawable d;
- GC gc;
- XPoint* points;
- int npoints;
- int mode;
+XDrawPoints(
+ Display* display,
+ Drawable d,
+ GC gc,
+ XPoint* points,
+ int npoints,
+ int mode)
{
}
void
-XWarpPointer(display, src_w, dest_w, src_x, src_y, src_width,
- src_height, dest_x, dest_y)
- Display* display;
- Window src_w;
- Window dest_w;
- int src_x;
- int src_y;
- unsigned int src_width;
- unsigned int src_height;
- int dest_x;
- int dest_y;
+XWarpPointer(
+ Display* display,
+ Window src_w,
+ Window dest_w,
+ int src_x,
+ int src_y,
+ unsigned int src_width,
+ unsigned int src_height,
+ int dest_x,
+ int dest_y)
{
}
void
-XQueryColor(display, colormap, def_in_out)
- Display* display;
- Colormap colormap;
- XColor* def_in_out;
+XQueryColor(
+ Display* display,
+ Colormap colormap,
+ XColor* def_in_out)
{
}
void
-XQueryColors(display, colormap, defs_in_out, ncolors)
- Display* display;
- Colormap colormap;
- XColor* defs_in_out;
- int ncolors;
+XQueryColors(
+ Display* display,
+ Colormap colormap,
+ XColor* defs_in_out,
+ int ncolors)
{
}