From 699ac1d9ed94cfe3db89826dd020e68139ebd331 Mon Sep 17 00:00:00 2001 From: Laurent Ganier Date: Thu, 28 Aug 2003 18:15:51 +0000 Subject: [PATCH] [ 794345 ] make visible the changed text when undo/redo --- Src/MergeEditView.cpp | 2 ++ Src/readme.txt | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/Src/MergeEditView.cpp b/Src/MergeEditView.cpp index 34def0c4f..a96a2a92d 100644 --- a/Src/MergeEditView.cpp +++ b/Src/MergeEditView.cpp @@ -484,6 +484,7 @@ void CMergeEditView::OnEditUndo() CMergeEditView *tgt = *(pDoc->curUndo-1); if(tgt==this) { + GetParentFrame()->SetActiveView(this, TRUE); if(CCrystalEditViewEx::OnEditUndo()) { --pDoc->curUndo; @@ -782,6 +783,7 @@ void CMergeEditView::OnEditRedo() CMergeEditView *tgt = *(pDoc->curUndo); if(tgt==this) { + GetParentFrame()->SetActiveView(this, TRUE); if(CCrystalEditViewEx::OnEditRedo()) { ++pDoc->curUndo; diff --git a/Src/readme.txt b/Src/readme.txt index 811b070ee..3a328802e 100644 --- a/Src/readme.txt +++ b/Src/readme.txt @@ -1,3 +1,7 @@ +2003-08-28 Laoran + PATCH: [ 794345 ] make visible the changed text when undo/redo + WinMerge: MergeEditView.cpp + 2003-08-27 Perry i18n effects of patch#781529: new popup menu, new dialog, alter existing col header strings Languages: Czech, Danish, Dutch -- 2.11.0