From 35ce2007d80841c95a624350031f3cdd523e9b03 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Sat, 30 Apr 2005 08:50:03 +0000 Subject: [PATCH] PATCH: [ 1192741 ] Fix panes resetting when right-clicking with mouse --- Src/LocationView.cpp | 6 +++--- Src/MergeEditView.cpp | 3 --- Src/readme.txt | 4 ++++ 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Src/LocationView.cpp b/Src/LocationView.cpp index 1c298add2..42c24f6b4 100644 --- a/Src/LocationView.cpp +++ b/Src/LocationView.cpp @@ -450,11 +450,11 @@ BOOL CLocationView::GotoLocation(CPoint point, BOOL bRealLine) return TRUE; } +/** + * Show context menu and handle user selection. + */ void CLocationView::OnContextMenu(CWnd* pWnd, CPoint point) { - // Make sure window is active - GetParentFrame()->ActivateFrame(); - if (point.x == -1 && point.y == -1) { //keystroke invocation diff --git a/Src/MergeEditView.cpp b/Src/MergeEditView.cpp index 467ddce4a..3c12dc805 100644 --- a/Src/MergeEditView.cpp +++ b/Src/MergeEditView.cpp @@ -1883,9 +1883,6 @@ void CMergeEditView::OnContextMenu(CWnd* pWnd, CPoint point) VERIFY(menu.LoadMenu(IDR_POPUP_MERGEVIEW)); VERIFY(menu.LoadToolbar(IDR_MAINFRAME)); - // Make sure window is active - GetParentFrame()->ActivateFrame(); - BCMenu *pSub = (BCMenu *)menu.GetSubMenu(0); ASSERT(pSub != NULL); diff --git a/Src/readme.txt b/Src/readme.txt index 6e30d1142..5e0c7d2cf 100644 --- a/Src/readme.txt +++ b/Src/readme.txt @@ -1,3 +1,7 @@ +2005-04-30 Kimmo + PATCH: [ 1192741 ] Fix panes resetting when right-clicking with mouse + Src: LocationView.cpp MergeEditView.cpp + 2005-04-28 Tim PATCH: [ 1190544 ] Translated Read Me-German.rtf Docs/Users/Languages: Read Me-German.rtf -- 2.11.0