PATCH: [ 1192741 ] Fix panes resetting when right-clicking with mouse

diff --git a/Src/LocationView.cpp b/Src/LocationView.cpp
index 1c298ad..42c24f6 100644 (file)
--- 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 467ddce..3c12dc8 100644 (file)
--- 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 6e30d11..5e0c7d2 100644 (file)
--- 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