summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornijtmans <nijtmans>2008-12-05 15:51:31 (GMT)
committernijtmans <nijtmans>2008-12-05 15:51:31 (GMT)
commit4b5e75e42f19e54ec6acb81fcc9ac036f5f9eab2 (patch)
tree485fbbfd2ae880eb037fd8f7fe400a490cfe5174
parentf6cf2b9418bcce56c89cf0efd5898654fb97a883 (diff)
downloadtk-4b5e75e42f19e54ec6acb81fcc9ac036f5f9eab2.zip
tk-4b5e75e42f19e54ec6acb81fcc9ac036f5f9eab2.tar.gz
tk-4b5e75e42f19e54ec6acb81fcc9ac036f5f9eab2.tar.bz2
undid previous 'fix': 'const' is only useful for pointers, not for
opaque types. Therefore it should not have slipped in here.
-rw-r--r--generic/tkInt.decls4
-rw-r--r--generic/tkIntDecls.h6
-rw-r--r--generic/tkTextIndex.c48
3 files changed, 29 insertions, 29 deletions
diff --git a/generic/tkInt.decls b/generic/tkInt.decls
index 0edfde5..776e38a 100644
--- a/generic/tkInt.decls
+++ b/generic/tkInt.decls
@@ -10,7 +10,7 @@
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
-# RCS: @(#) $Id: tkInt.decls,v 1.50 2008/12/04 21:33:25 nijtmans Exp $
+# RCS: @(#) $Id: tkInt.decls,v 1.51 2008/12/05 15:51:31 nijtmans Exp $
library tk
@@ -535,7 +535,7 @@ declare 161 generic {
struct TkTextIndex *dstPtr)
}
declare 162 generic {
- struct TkTextIndex *TkTextMakeByteIndex(const TkTextBTree tree,
+ struct TkTextIndex *TkTextMakeByteIndex(TkTextBTree tree,
const struct TkText *textPtr, int lineIndex,
int byteIndex, struct TkTextIndex *indexPtr)
}
diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h
index 77e429a..78bf6d1 100644
--- a/generic/tkIntDecls.h
+++ b/generic/tkIntDecls.h
@@ -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: tkIntDecls.h,v 1.40 2008/12/04 21:33:25 nijtmans Exp $
+ * RCS: @(#) $Id: tkIntDecls.h,v 1.41 2008/12/05 15:51:31 nijtmans Exp $
*/
#ifndef _TKINTDECLS
@@ -993,7 +993,7 @@ EXTERN int TkTextIndexForwBytes (const struct TkText * textPtr,
#ifndef TkTextMakeByteIndex_TCL_DECLARED
#define TkTextMakeByteIndex_TCL_DECLARED
/* 162 */
-EXTERN struct TkTextIndex * TkTextMakeByteIndex (const TkTextBTree tree,
+EXTERN struct TkTextIndex * TkTextMakeByteIndex (TkTextBTree tree,
const struct TkText * textPtr, int lineIndex,
int byteIndex, struct TkTextIndex * indexPtr);
#endif
@@ -1306,7 +1306,7 @@ typedef struct TkIntStubs {
int (*tkTextGetIndex) (Tcl_Interp * interp, struct TkText * textPtr, const char * string, struct TkTextIndex * indexPtr); /* 159 */
int (*tkTextIndexBackBytes) (const struct TkText * textPtr, const struct TkTextIndex * srcPtr, int count, struct TkTextIndex * dstPtr); /* 160 */
int (*tkTextIndexForwBytes) (const struct TkText * textPtr, const struct TkTextIndex * srcPtr, int count, struct TkTextIndex * dstPtr); /* 161 */
- struct TkTextIndex * (*tkTextMakeByteIndex) (const TkTextBTree tree, const struct TkText * textPtr, int lineIndex, int byteIndex, struct TkTextIndex * indexPtr); /* 162 */
+ struct TkTextIndex * (*tkTextMakeByteIndex) (TkTextBTree tree, const struct TkText * textPtr, int lineIndex, int byteIndex, struct TkTextIndex * indexPtr); /* 162 */
int (*tkTextPrintIndex) (const struct TkText * textPtr, const struct TkTextIndex * indexPtr, char * string); /* 163 */
struct TkTextSegment * (*tkTextSetMark) (struct TkText * textPtr, const char * name, struct TkTextIndex * indexPtr); /* 164 */
int (*tkTextXviewCmd) (struct TkText * textPtr, Tcl_Interp * interp, int objc, Tcl_Obj *const objv[]); /* 165 */
diff --git a/generic/tkTextIndex.c b/generic/tkTextIndex.c
index 7d900ee..3631cf5 100644
--- a/generic/tkTextIndex.c
+++ b/generic/tkTextIndex.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkTextIndex.c,v 1.33 2008/12/05 09:33:12 patthoyts Exp $
+ * RCS: @(#) $Id: tkTextIndex.c,v 1.34 2008/12/05 15:51:31 nijtmans Exp $
*/
#include "default.h"
@@ -79,7 +79,7 @@ const Tcl_ObjType tkTextIndexType = {
NULL, /* updateStringProc */
SetTextIndexFromAny /* setFromAnyProc */
};
-
+
static void
FreeTextIndexInternalRep(
Tcl_Obj *indexObjPtr) /* TextIndex object with internal rep to
@@ -149,7 +149,7 @@ SetTextIndexFromAny(
"via TkTextGetIndexFromObj API", -1);
return TCL_ERROR;
}
-
+
/*
*---------------------------------------------------------------------------
*
@@ -199,7 +199,7 @@ MakeObjIndex(
}
return indexPtr;
}
-
+
const TkTextIndex *
TkTextGetIndexFromObj(
Tcl_Interp *interp, /* Use this for error reporting. */
@@ -246,7 +246,7 @@ TkTextGetIndexFromObj(
return MakeObjIndex((cache ? textPtr : NULL), objPtr, &index);
}
-
+
/*
*---------------------------------------------------------------------------
*
@@ -291,7 +291,7 @@ TkTextNewIndexObj(
UpdateStringOfTextIndex(retVal);
return retVal;
}
-
+
/*
*---------------------------------------------------------------------------
*
@@ -359,7 +359,7 @@ TkTextMakePixelIndex(
}
return TkTextMeasureDown(textPtr, indexPtr, pixelOffset);
}
-
+
/*
*---------------------------------------------------------------------------
*
@@ -382,7 +382,7 @@ TkTextMakePixelIndex(
TkTextIndex *
TkTextMakeByteIndex(
- const TkTextBTree tree, /* Tree that lineIndex and byteIndex refer
+ TkTextBTree tree, /* Tree that lineIndex and byteIndex refer
* to. */
const TkText *textPtr,
int lineIndex, /* Index of desired line (0 means first line
@@ -452,7 +452,7 @@ TkTextMakeByteIndex(
}
return indexPtr;
}
-
+
/*
*---------------------------------------------------------------------------
*
@@ -547,7 +547,7 @@ TkTextMakeCharIndex(
}
return indexPtr;
}
-
+
/*
*---------------------------------------------------------------------------
*
@@ -587,7 +587,7 @@ TkTextIndexToSeg(
}
return segPtr;
}
-
+
/*
*---------------------------------------------------------------------------
*
@@ -620,7 +620,7 @@ TkTextSegToOffset(
}
return offset;
}
-
+
/*
*---------------------------------------------------------------------------
*
@@ -649,7 +649,7 @@ TkTextGetObjIndex(
return GetIndex(interp, NULL, textPtr, Tcl_GetString(idxObj), indexPtr,
NULL);
}
-
+
/*
*---------------------------------------------------------------------------
*
@@ -678,7 +678,7 @@ TkTextSharedGetObjIndex(
return GetIndex(interp, sharedTextPtr, NULL, Tcl_GetString(idxObj),
indexPtr, NULL);
}
-
+
/*
*---------------------------------------------------------------------------
*
@@ -707,7 +707,7 @@ TkTextGetIndex(
{
return GetIndex(interp, NULL, textPtr, string, indexPtr, NULL);
}
-
+
/*
*---------------------------------------------------------------------------
*
@@ -1000,7 +1000,7 @@ GetIndex(
Tcl_AppendResult(interp, "bad text index \"", string, "\"", NULL);
return TCL_ERROR;
}
-
+
/*
*---------------------------------------------------------------------------
*
@@ -1064,7 +1064,7 @@ TkTextPrintIndex(
return sprintf(string, "%d.%d",
TkBTreeLinesTo(textPtr, indexPtr->linePtr) + 1, charIndex);
}
-
+
/*
*---------------------------------------------------------------------------
*
@@ -1117,7 +1117,7 @@ TkTextIndexCmp(
}
return 0;
}
-
+
/*
*---------------------------------------------------------------------------
*
@@ -1361,7 +1361,7 @@ ForwBack(
}
return p;
}
-
+
/*
*---------------------------------------------------------------------------
*
@@ -1431,7 +1431,7 @@ TkTextIndexForwBytes(
dstPtr->linePtr = linePtr;
}
}
-
+
/*
*---------------------------------------------------------------------------
*
@@ -1610,7 +1610,7 @@ TkTextIndexForwChars(
ckfree((char *) infoPtr);
}
}
-
+
/*
*---------------------------------------------------------------------------
*
@@ -1875,7 +1875,7 @@ TkTextIndexBackBytes(
}
return 0;
}
-
+
/*
*---------------------------------------------------------------------------
*
@@ -2090,7 +2090,7 @@ TkTextIndexBackChars(
ckfree((char *) infoPtr);
}
}
-
+
/*
*----------------------------------------------------------------------
*
@@ -2294,7 +2294,7 @@ StartEnd(
done:
return p;
}
-
+
/*
* Local Variables:
* mode: c