From eb592a1777f112e6ba0eb41da39d850f3d80c21e Mon Sep 17 00:00:00 2001
From: Max Doerner <maxdoerner@gmx.net>
Date: Wed, 13 Feb 2019 02:49:45 +0100
Subject: [PATCH] Also stop activating panes on setting the selection in VB6

---
 .../SafeComWrappers/VB/CodePane.cs            | 33 +------------------
 .../SafeComWrappers/VB/CodePane.cs            |  4 +--
 2 files changed, 2 insertions(+), 35 deletions(-)

diff --git a/Rubberduck.VBEditor.VB6/SafeComWrappers/VB/CodePane.cs b/Rubberduck.VBEditor.VB6/SafeComWrappers/VB/CodePane.cs
index 96c5f9f822..5ca1fbf3b3 100644
--- a/Rubberduck.VBEditor.VB6/SafeComWrappers/VB/CodePane.cs
+++ b/Rubberduck.VBEditor.VB6/SafeComWrappers/VB/CodePane.cs
@@ -1,6 +1,4 @@
-using System;
-using Rubberduck.VBEditor.SafeComWrappers.Abstract;
-using Rubberduck.VBEditor.WindowsApi;
+using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 using VB = Microsoft.Vbe.Interop.VB6;
 
 // ReSharper disable once CheckNamespace - Special dispensation due to conflicting file vs namespace priorities
@@ -90,35 +88,6 @@ private void SetSelection(int startLine, int startColumn, int endLine, int endCo
                 return;
             }
             Target.SetSelection(startLine, startColumn, endLine, endColumn);
-            ForceFocus();
-        }
-
-        private void ForceFocus()
-        {
-            if (IsWrappingNullReference)
-            {
-                return;
-            }
-
-            Show();
-
-            using (var vbe = VBE)
-            using (var mainWindow = vbe.MainWindow)
-            using (var window = Window)
-            {
-                var mainWindowHandle = mainWindow.Handle();
-                var handle = mainWindow.Handle().FindChildWindow(window.Caption);
-
-                if (handle != IntPtr.Zero)
-                {
-                    NativeMethods.ActivateWindow(handle, mainWindowHandle);
-                }
-                else
-                {
-                    _logger.Debug(
-                        "CodePane.ForceFocus() failed to get a handle on the MainWindow.");
-                }
-            }
         }
 
         public void Show()
diff --git a/Rubberduck.VBEditor.VBA/SafeComWrappers/VB/CodePane.cs b/Rubberduck.VBEditor.VBA/SafeComWrappers/VB/CodePane.cs
index c20a55d50b..04ce59c9fe 100644
--- a/Rubberduck.VBEditor.VBA/SafeComWrappers/VB/CodePane.cs
+++ b/Rubberduck.VBEditor.VBA/SafeComWrappers/VB/CodePane.cs
@@ -1,6 +1,4 @@
-using System;
-using Rubberduck.VBEditor.SafeComWrappers.Abstract;
-using Rubberduck.VBEditor.WindowsApi;
+using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 using VB = Microsoft.Vbe.Interop;
 
 // ReSharper disable once CheckNamespace - Special dispensation due to conflicting file vs namespace priorities