From 7d880430f8221e2407a36e73cb290736a82e9fe4 Mon Sep 17 00:00:00 2001 From: hobbs Date: Fri, 18 Apr 2003 21:56:47 +0000 Subject: * generic/tkCanvBmap.c: s/CreateBitmap/TkcCreateBitmap as Windows has a CreateBitmap function already. --- generic/tkCanvBmap.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/generic/tkCanvBmap.c b/generic/tkCanvBmap.c index 5852533..6f979cf 100644 --- a/generic/tkCanvBmap.c +++ b/generic/tkCanvBmap.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkCanvBmap.c,v 1.7 2003/02/09 07:48:22 hobbs Exp $ + * RCS: @(#) $Id: tkCanvBmap.c,v 1.7.2.1 2003/04/18 21:56:47 hobbs Exp $ */ #include @@ -105,7 +105,7 @@ static void ComputeBitmapBbox _ANSI_ARGS_((Tk_Canvas canvas, static int ConfigureBitmap _ANSI_ARGS_((Tcl_Interp *interp, Tk_Canvas canvas, Tk_Item *itemPtr, int objc, Tcl_Obj *CONST objv[], int flags)); -static int CreateBitmap _ANSI_ARGS_((Tcl_Interp *interp, +static int TkcCreateBitmap _ANSI_ARGS_((Tcl_Interp *interp, Tk_Canvas canvas, struct Tk_Item *itemPtr, int objc, Tcl_Obj *CONST objv[])); static void DeleteBitmap _ANSI_ARGS_((Tk_Canvas canvas, @@ -127,7 +127,7 @@ static void TranslateBitmap _ANSI_ARGS_((Tk_Canvas canvas, Tk_ItemType tkBitmapType = { "bitmap", /* name */ sizeof(BitmapItem), /* itemSize */ - CreateBitmap, /* createProc */ + TkcCreateBitmap, /* createProc */ configSpecs, /* configSpecs */ ConfigureBitmap, /* configureProc */ BitmapCoords, /* coordProc */ @@ -150,7 +150,7 @@ Tk_ItemType tkBitmapType = { /* *-------------------------------------------------------------- * - * CreateBitmap -- + * TkcCreateBitmap -- * * This procedure is invoked to create a new bitmap * item in a canvas. @@ -168,7 +168,7 @@ Tk_ItemType tkBitmapType = { */ static int -CreateBitmap(interp, canvas, itemPtr, objc, objv) +TkcCreateBitmap(interp, canvas, itemPtr, objc, objv) Tcl_Interp *interp; /* Interpreter for error reporting. */ Tk_Canvas canvas; /* Canvas to hold new item. */ Tk_Item *itemPtr; /* Record to hold new item; header -- cgit v0.12