diff options
| author | hobbs <hobbs> | 2000-04-14 08:33:15 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2000-04-14 08:33:15 (GMT) |
| commit | fef56976bf80f019323ba08dffe50ca4852ab2b3 (patch) | |
| tree | 8e247a35f4a7ee83ba8f124dcece1315e9919ff6 /generic/tkCanvas.c | |
| parent | 0941394aa5a9f25b307350db2df703cff3c8d432 (diff) | |
| download | tk-fef56976bf80f019323ba08dffe50ca4852ab2b3.zip tk-fef56976bf80f019323ba08dffe50ca4852ab2b3.tar.gz tk-fef56976bf80f019323ba08dffe50ca4852ab2b3.tar.bz2 | |
* generic/tkCanvas.c (CanvasEventProc:2451): corrected cast
* generic/tkEntry.c (Tk_EntryObjCmd): adjusted finishing error
cases and changed TK_CONFIG_NULL_OK to TK_OPTION_NULL_OK
* tests/scale.test:
* generic/tkScale.c:
* generic/tkScale.h:
* unix/tkUnixScale.c:
* mac/tkMacScale.c: moved (PixelToValue|ValueToPixel|SetScaleValue)
to tkScale.c. Caused an associated variable to be immediately set
[Bug: 4833]
Diffstat (limited to 'generic/tkCanvas.c')
| -rw-r--r-- | generic/tkCanvas.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tkCanvas.c b/generic/tkCanvas.c index 09bde91..709375a 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.13 2000/04/13 17:36:58 ericm Exp $ + * RCS: @(#) $Id: tkCanvas.c,v 1.14 2000/04/14 08:33:15 hobbs Exp $ */ /* #define USE_OLD_TAG_SEARCH 1 */ @@ -2448,7 +2448,7 @@ CanvasEventProc(clientData, eventPtr) canvasPtr->flags |= REDRAW_BORDERS; } } else if (eventPtr->type == DestroyNotify) { - DestroyCanvas((ClientData) canvasPtr); + DestroyCanvas((char *) canvasPtr); } else if (eventPtr->type == ConfigureNotify) { canvasPtr->flags |= UPDATE_SCROLLBARS; |