From 0a1a1de9e6e1f82f81090b072814b6c2e16ed1b5 Mon Sep 17 00:00:00 2001 From: Perry Rapp Date: Sun, 20 Apr 2003 20:20:03 +0000 Subject: [PATCH] PATCH: [ 724493 ] WaitStatusCursor for MergeDoc rescans --- Src/MergeDoc.cpp | 2 ++ Src/readme.txt | 2 ++ 2 files changed, 4 insertions(+) diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp index c10fc3b58..72c666714 100644 --- a/Src/MergeDoc.cpp +++ b/Src/MergeDoc.cpp @@ -1387,6 +1387,8 @@ void CMergeDoc::FlushAndRescan() { if (!m_bEnableRescan) return; + WaitStatusCursor waitstatus(LoadResString(IDS_STATUS_RESCANNING)); + CMDIFrameWnd* mainWnd = dynamic_cast(AfxGetMainWnd()); CMDIChildWnd* diffWnd = dynamic_cast(mainWnd->MDIGetActive()); CCrystalEditView* curView = dynamic_cast(diffWnd->GetActiveView()); diff --git a/Src/readme.txt b/Src/readme.txt index 20260a8cb..3541213a1 100644 --- a/Src/readme.txt +++ b/Src/readme.txt @@ -10,6 +10,8 @@ WinMerge: DirDoc.cpp bugfix: Add new files that were part of patch#724309 WinMerge: WaitStatusCursor.cpp WaitStatusCursor.h + PATCH: [ 724493 ] WaitStatusCursor for MergeDoc rescans + WinMerge: MergeDoc.cpp 2003-04-19 Perry [ 724280 ] Could use wait cursors at OpenSelection calls -- 2.11.0