Only subclass designer windows or code panes. Closes #2786

Author: comintern

RetailCoder.VBE/Common/WinAPI/User32.cs

@@ -160,9 +160,6 @@ public static class User32
         [DllImport("user32.dll", CharSet = CharSet.Auto)]
         internal static extern IntPtr SendMessage(IntPtr hWnd, WM msg, IntPtr wParam, IntPtr lParam);
 
-        [DllImport("user32.dll", CharSet = CharSet.Unicode)]
-        public static extern IntPtr FindWindowEx(IntPtr parentHandle, IntPtr childAfter, string lclassName, string windowTitle);
-
         public delegate int WindowEnumProc(IntPtr hwnd, IntPtr lparam);
         [DllImport("user32.dll")]
         public static extern bool EnumChildWindows(IntPtr hwnd, WindowEnumProc func, IntPtr lParam);

Rubberduck.VBEEditor/Events/VBENativeServices.cs

@@ -70,15 +70,15 @@ public static void VbeEventCallback(IntPtr hWinEventHook, uint eventType, IntPtr
         {
             if (hwnd != IntPtr.Zero && 
                 idObject == (int)ObjId.Caret && 
-                (eventType == (uint)WinEvent.ObjectLocationChange || eventType == (uint)WinEvent.ObjectCreate) && 
-                hwnd.ToWindowType() == WindowType.VbaWindow)
+                (eventType == (uint)WinEvent.ObjectLocationChange || eventType == (uint)WinEvent.ObjectCreate) &&
+                hwnd.ToWindowType() == WindowType.CodePane)
             {
                 OnSelectionChanged(hwnd);             
             }
             else if (idObject == (int)ObjId.Window && (eventType == (uint)WinEvent.ObjectCreate || eventType == (uint)WinEvent.ObjectDestroy))
             {
                 var type = hwnd.ToWindowType();
-                if (type != WindowType.DesignerWindow && type != WindowType.VbaWindow)
+                if (type != WindowType.DesignerWindow && type != WindowType.CodePane)
                 {
                     return;                   
                 }
@@ -195,14 +195,23 @@ public enum WindowType
         {
             Indeterminate,
             VbaWindow,
+            CodePane,
             DesignerWindow,
             Project
         }
 
         public static WindowType ToWindowType(this IntPtr hwnd)
         {
             WindowType id;
-            return Enum.TryParse(hwnd.ToClassName(), true, out id) ? id : WindowType.Indeterminate;
+            var type = Enum.TryParse(hwnd.ToClassName(), true, out id) ? id : WindowType.Indeterminate;
+            if (type != WindowType.VbaWindow)
+            {
+                return type;
+            }
+            //A this point we only care about code panes - none of the other 4 types of VbaWindows (Immediate, Object Browser, Locals,
+            //and Watches) contain a tool bar at the top, so just see if the window has one as a child.
+            var toolbar = User32.FindWindowEx(hwnd, IntPtr.Zero, "ObtbarWndClass", string.Empty);
+            return toolbar == IntPtr.Zero ? WindowType.VbaWindow : WindowType.CodePane;
         }
 
         public static string ToClassName(this IntPtr hwnd)

Rubberduck.VBEEditor/WindowsApi/User32.cs

@@ -79,5 +79,8 @@ public static class User32
         /// <returns>   The parent window IntPtr handle. </returns>
         [DllImport("User32.dll")]
         internal static extern IntPtr GetParent(IntPtr hWnd);
+
+        [DllImport("user32.dll", CharSet = CharSet.Unicode)]
+        internal static extern IntPtr FindWindowEx(IntPtr parentHandle, IntPtr childAfter, string lclassName, string windowTitle);
     }
 }