diff options
Diffstat (limited to 'generic/tkText.c')
-rw-r--r-- | generic/tkText.c | 86 |
1 files changed, 0 insertions, 86 deletions
diff --git a/generic/tkText.c b/generic/tkText.c index 8ae17a5..412a7f2 100644 --- a/generic/tkText.c +++ b/generic/tkText.c @@ -2774,9 +2774,6 @@ TextPushUndoAction( { TkUndoSubAtom *iAtom, *dAtom; int canUndo, canRedo; - char lMarkName[20] = "tk::undoMarkL"; - char rMarkName[20] = "tk::undoMarkR"; - char stringUndoMarkId[7] = ""; /* * Create the helpers. @@ -2787,10 +2784,6 @@ TextPushUndoAction( Tcl_Obj *markSet2InsertObj = NULL; Tcl_Obj *insertCmdObj = Tcl_NewObj(); Tcl_Obj *deleteCmdObj = Tcl_NewObj(); - Tcl_Obj *markSetLUndoMarkCmdObj = Tcl_NewObj(); - Tcl_Obj *markSetRUndoMarkCmdObj = NULL; - Tcl_Obj *markGravityLUndoMarkCmdObj = Tcl_NewObj(); - Tcl_Obj *markGravityRUndoMarkCmdObj = NULL; /* * Get the index positions. @@ -2840,40 +2833,6 @@ TextPushUndoAction( Tcl_ListObjAppendElement(NULL, deleteCmdObj, index1Obj); Tcl_ListObjAppendElement(NULL, deleteCmdObj, index2Obj); - Tcl_ListObjAppendElement(NULL, markSetLUndoMarkCmdObj, - Tcl_NewStringObj(Tk_PathName(textPtr->tkwin), -1)); - Tcl_ListObjAppendElement(NULL, markSetLUndoMarkCmdObj, - Tcl_NewStringObj("mark", 4)); - Tcl_ListObjAppendElement(NULL, markSetLUndoMarkCmdObj, - Tcl_NewStringObj("set", 3)); - markSetRUndoMarkCmdObj = Tcl_DuplicateObj(markSetLUndoMarkCmdObj); - textPtr->sharedTextPtr->undoMarkId++; - sprintf(stringUndoMarkId, "%d", textPtr->sharedTextPtr->undoMarkId); - strcat(lMarkName, stringUndoMarkId); - strcat(rMarkName, stringUndoMarkId); - Tcl_ListObjAppendElement(NULL, markSetLUndoMarkCmdObj, - Tcl_NewStringObj(lMarkName, -1)); - Tcl_ListObjAppendElement(NULL, markSetRUndoMarkCmdObj, - Tcl_NewStringObj(rMarkName, -1)); - Tcl_ListObjAppendElement(NULL, markSetLUndoMarkCmdObj, index1Obj); - Tcl_ListObjAppendElement(NULL, markSetRUndoMarkCmdObj, index2Obj); - - Tcl_ListObjAppendElement(NULL, markGravityLUndoMarkCmdObj, - Tcl_NewStringObj(Tk_PathName(textPtr->tkwin), -1)); - Tcl_ListObjAppendElement(NULL, markGravityLUndoMarkCmdObj, - Tcl_NewStringObj("mark", 4)); - Tcl_ListObjAppendElement(NULL, markGravityLUndoMarkCmdObj, - Tcl_NewStringObj("gravity", 7)); - markGravityRUndoMarkCmdObj = Tcl_DuplicateObj(markGravityLUndoMarkCmdObj); - Tcl_ListObjAppendElement(NULL, markGravityLUndoMarkCmdObj, - Tcl_NewStringObj(lMarkName, -1)); - Tcl_ListObjAppendElement(NULL, markGravityRUndoMarkCmdObj, - Tcl_NewStringObj(rMarkName, -1)); - Tcl_ListObjAppendElement(NULL, markGravityLUndoMarkCmdObj, - Tcl_NewStringObj("left", 4)); - Tcl_ListObjAppendElement(NULL, markGravityRUndoMarkCmdObj, - Tcl_NewStringObj("right", 5)); - /* * Note: we don't wish to use textPtr->widgetCmd in these callbacks * because if we delete the textPtr, but peers still exist, we will then @@ -2891,19 +2850,11 @@ TextPushUndoAction( insertCmdObj, NULL); TkUndoMakeCmdSubAtom(NULL, markSet2InsertObj, iAtom); TkUndoMakeCmdSubAtom(NULL, seeInsertObj, iAtom); - TkUndoMakeCmdSubAtom(NULL, markSetLUndoMarkCmdObj, iAtom); - TkUndoMakeCmdSubAtom(NULL, markSetRUndoMarkCmdObj, iAtom); - TkUndoMakeCmdSubAtom(NULL, markGravityLUndoMarkCmdObj, iAtom); - TkUndoMakeCmdSubAtom(NULL, markGravityRUndoMarkCmdObj, iAtom); dAtom = TkUndoMakeSubAtom(&TextUndoRedoCallback, textPtr->sharedTextPtr, deleteCmdObj, NULL); TkUndoMakeCmdSubAtom(NULL, markSet1InsertObj, dAtom); TkUndoMakeCmdSubAtom(NULL, seeInsertObj, dAtom); - TkUndoMakeCmdSubAtom(NULL, markSetLUndoMarkCmdObj, dAtom); - TkUndoMakeCmdSubAtom(NULL, markSetRUndoMarkCmdObj, dAtom); - TkUndoMakeCmdSubAtom(NULL, markGravityLUndoMarkCmdObj, dAtom); - TkUndoMakeCmdSubAtom(NULL, markGravityRUndoMarkCmdObj, dAtom); Tcl_DecrRefCount(seeInsertObj); Tcl_DecrRefCount(index1Obj); @@ -5118,8 +5069,6 @@ TextEditUndo( TkText *textPtr) /* Overall information about text widget. */ { int status; - Tcl_Obj *cmdObj; - int code; if (!textPtr->sharedTextPtr->undo) { return TCL_OK; @@ -5143,22 +5092,6 @@ TextEditUndo( } textPtr->sharedTextPtr->undo = 1; - /* - * Convert undo/redo temporary marks set by TkUndoRevert() into - * indices left in the interp result. - */ - - cmdObj = Tcl_ObjPrintf("::tk::TextUndoRedoProcessMarks %s", - Tk_PathName(textPtr->tkwin)); - Tcl_IncrRefCount(cmdObj); - code = Tcl_EvalObjEx(textPtr->interp, cmdObj, TCL_EVAL_GLOBAL); - if (code != TCL_OK) { - Tcl_AddErrorInfo(textPtr->interp, - "\n (on undoing)"); - Tcl_BackgroundException(textPtr->interp, code); - } - Tcl_DecrRefCount(cmdObj); - return status; } @@ -5184,8 +5117,6 @@ TextEditRedo( TkText *textPtr) /* Overall information about text widget. */ { int status; - Tcl_Obj *cmdObj; - int code; if (!textPtr->sharedTextPtr->undo) { return TCL_OK; @@ -5208,23 +5139,6 @@ TextEditRedo( textPtr->sharedTextPtr->dirtyMode = TK_TEXT_DIRTY_NORMAL; } textPtr->sharedTextPtr->undo = 1; - - /* - * Convert undo/redo temporary marks set by TkUndoApply() into - * indices left in the interp result. - */ - - cmdObj = Tcl_ObjPrintf("::tk::TextUndoRedoProcessMarks %s", - Tk_PathName(textPtr->tkwin)); - Tcl_IncrRefCount(cmdObj); - code = Tcl_EvalObjEx(textPtr->interp, cmdObj, TCL_EVAL_GLOBAL); - if (code != TCL_OK) { - Tcl_AddErrorInfo(textPtr->interp, - "\n (on undoing)"); - Tcl_BackgroundException(textPtr->interp, code); - } - Tcl_DecrRefCount(cmdObj); - return status; } |