summaryrefslogtreecommitdiffstats
path: root/generic/tkBitmap.c
diff options
context:
space:
mode:
authordgp@users.sourceforge.net <dgp>2002-08-05 04:30:37 (GMT)
committerdgp@users.sourceforge.net <dgp>2002-08-05 04:30:37 (GMT)
commit7f2950e2d95664dad25850185a717df6019c37e7 (patch)
tree7d072949961c0e2749f8fc33c73bf1d093c3d635 /generic/tkBitmap.c
parent6f421c178b9494c37357300d21b54901efcca6d1 (diff)
downloadtk-7f2950e2d95664dad25850185a717df6019c37e7.zip
tk-7f2950e2d95664dad25850185a717df6019c37e7.tar.gz
tk-7f2950e2d95664dad25850185a717df6019c37e7.tar.bz2
Applied companion patch for Tcl Patch 585105,
updating Tk to use Tcl 8.4's fully CONST-ified interface, and fully CONSTifying Tk at the same time. This patch includes purging Tk of its last direct access to interp->result. [Bug 589853] The substantial changes include copying event sequence strings into Tcl_DStrings in tkBind.c, and copying [text] indices into Tcl_DStrings because parsing them involved overwriting them. If this causes performance trouble, that can be resolved by further converting them to Tcl_Obj's. The #defines USE_NON_CONST and USE_COMPAT_CONST have the same effect for Tk as they do for Tcl. (They actually change tcl.h)
Diffstat (limited to 'generic/tkBitmap.c')
-rw-r--r--generic/tkBitmap.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/generic/tkBitmap.c b/generic/tkBitmap.c
index fc445f6..3f9e2e6 100644
--- a/generic/tkBitmap.c
+++ b/generic/tkBitmap.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: tkBitmap.c,v 1.9 2001/08/15 15:44:36 dkf Exp $
+ * RCS: @(#) $Id: tkBitmap.c,v 1.10 2002/08/05 04:30:38 dgp Exp $
*/
#include "tkPort.h"
@@ -87,7 +87,7 @@ typedef struct TkBitmap {
*/
typedef struct {
- char *source; /* Bitmap bits. */
+ CONST char *source; /* Bitmap bits. */
int width, height; /* Dimensions of bitmap. */
} DataKey;
@@ -468,7 +468,7 @@ Tk_DefineBitmap(interp, name, source, width, height)
Tcl_Interp *interp; /* Interpreter to use for error reporting. */
CONST char *name; /* Name to use for bitmap. Must not already
* be defined as a bitmap. */
- char *source; /* Address of bits for bitmap. */
+ CONST char *source; /* Address of bits for bitmap. */
int width; /* Width of bitmap. */
int height; /* Height of bitmap. */
{
@@ -523,7 +523,7 @@ Tk_DefineBitmap(interp, name, source, width, height)
*--------------------------------------------------------------
*/
-char *
+CONST char *
Tk_NameOfBitmap(display, bitmap)
Display *display; /* Display for which bitmap was
* allocated. */
@@ -809,7 +809,7 @@ Pixmap
Tk_GetBitmapFromData(interp, tkwin, source, width, height)
Tcl_Interp *interp; /* Interpreter to use for error reporting. */
Tk_Window tkwin; /* Window in which bitmap will be used. */
- char *source; /* Bitmap data for bitmap shape. */
+ CONST char *source; /* Bitmap data for bitmap shape. */
int width, height; /* Dimensions of bitmap. */
{
DataKey nameKey;