Some more places where Tcl_Obj's can be usedscrollbar_obj_cmd

2 files changed, 17 insertions, 13 deletions

diff --git a/generic/tkText.c b/generic/tkText.c
index 2c7eec3..9c436c6 100644
--- a/generic/tkText.c
+++ b/generic/tkText.c
@@ -6675,11 +6675,7 @@ TkpTesttextCmd(
     if (Tcl_GetCommandInfo(interp, argv[1], &info) == 0) {
 	return TCL_ERROR;
     }
-    if (info.isNativeObjectProc) {
-	textPtr = info.objClientData;
-    } else {
-	textPtr = info.clientData;
-    }
+    textPtr = info.objClientData;
     len = strlen(argv[2]);
     if (strncmp(argv[2], "byteindex", len) == 0) {
 	if (argc != 5) {
diff --git a/generic/tkTextMark.c b/generic/tkTextMark.c
index 56a21f9..4cfa0ea 100644
--- a/generic/tkTextMark.c
+++ b/generic/tkTextMark.c
@@ -40,9 +40,9 @@ static int		MarkLayoutProc(TkText *textPtr, TkTextIndex *indexPtr,
 			    int maxChars, int noCharsYet, TkWrapMode wrapMode,
 			    TkTextDispChunk *chunkPtr);
 static int		MarkFindNext(Tcl_Interp *interp,
-			    TkText *textPtr, const char *markName);
+			    TkText *textPtr, Tcl_Obj *markName);
 static int		MarkFindPrev(Tcl_Interp *interp,
-			    TkText *textPtr, const char *markName);
+			    TkText *textPtr, Tcl_Obj *markName);
 
 
 /*
@@ -205,13 +205,13 @@ TkTextMarkCmd(
 	    Tcl_WrongNumArgs(interp, 3, objv, "index");
 	    return TCL_ERROR;
 	}
-	return MarkFindNext(interp, textPtr, Tcl_GetString(objv[3]));
+	return MarkFindNext(interp, textPtr, objv[3]);
     case MARK_PREVIOUS:
 	if (objc != 4) {
 	    Tcl_WrongNumArgs(interp, 3, objv, "index");
 	    return TCL_ERROR;
 	}
-	return MarkFindPrev(interp, textPtr, Tcl_GetString(objv[3]));
+	return MarkFindPrev(interp, textPtr, objv[3]);
     case MARK_SET:
 	if (objc != 5) {
 	    Tcl_WrongNumArgs(interp, 3, objv, "markName index");
@@ -805,12 +805,13 @@ static int
 MarkFindNext(
     Tcl_Interp *interp,		/* For error reporting */
     TkText *textPtr,		/* The widget */
-    const char *string)		/* The starting index or mark name */
+    Tcl_Obj *obj)			/* The starting index or mark name */
 {
     TkTextIndex index;
     Tcl_HashEntry *hPtr;
     register TkTextSegment *segPtr;
     int offset;
+    const char *string = Tcl_GetString(obj);
 
     if (!strcmp(string, "insert")) {
 	segPtr = textPtr->insertMarkPtr;
@@ -837,10 +838,13 @@ MarkFindNext(
 	     * For non-mark name indices we want to return any marks that are
 	     * right at the index.
 	     */
+	    const TkTextIndex *indexFromPtr;
 
-	    if (TkTextGetIndex(interp, textPtr, string, &index) != TCL_OK) {
+	    indexFromPtr = TkTextGetIndexFromObj(interp, textPtr, obj);
+	    if (indexFromPtr == NULL) {
 		return TCL_ERROR;
 	    }
+	    memcpy(&index, indexFromPtr, sizeof(TkTextIndex));
 	    for (offset = 0, segPtr = index.linePtr->segPtr;
 		    segPtr != NULL && offset < index.byteIndex;
 		    offset += segPtr->size, segPtr = segPtr->nextPtr) {
@@ -895,12 +899,13 @@ static int
 MarkFindPrev(
     Tcl_Interp *interp,		/* For error reporting */
     TkText *textPtr,		/* The widget */
-    const char *string)		/* The starting index or mark name */
+    Tcl_Obj *obj)			/* The starting index or mark name */
 {
     TkTextIndex index;
     Tcl_HashEntry *hPtr;
     register TkTextSegment *segPtr, *seg2Ptr, *prevPtr;
     int offset;
+    const char *string = Tcl_GetString(obj);
 
     if (!strcmp(string, "insert")) {
 	segPtr = textPtr->insertMarkPtr;
@@ -924,10 +929,13 @@ MarkFindPrev(
 	     * For non-mark name indices we do not return any marks that are
 	     * right at the index.
 	     */
+	    const TkTextIndex *indexFromPtr;
 
-	    if (TkTextGetIndex(interp, textPtr, string, &index) != TCL_OK) {
+	    indexFromPtr = TkTextGetIndexFromObj(interp, textPtr, obj);
+	    if (indexFromPtr == NULL) {
 		return TCL_ERROR;
 	    }
+	    memcpy(&index, indexFromPtr, sizeof(TkTextIndex));
 	    for (offset = 0, segPtr = index.linePtr->segPtr;
 		    segPtr != NULL && offset < index.byteIndex;
 		    offset += segPtr->size, segPtr = segPtr->nextPtr) {