Merge pull request #1848 from comintern/next

Hosch250 · web-flow · commit 4f820010a671 · 2016-06-16T17:43:24.000-05:00
Changed ActivateWindow to send WM_MDIACTIVATE instead of simulated mo…
diff --git a/Rubberduck.VBEEditor/NativeMethods.cs b/Rubberduck.VBEEditor/NativeMethods.cs
@@ -84,11 +84,9 @@ internal static string GetWindowTextByHwnd(IntPtr windowHandle)
         /// <param name="parentWindowHandle">   Handle of the parent window. </param>
         internal static void ActivateWindow(IntPtr windowHandle, IntPtr parentWindowHandle)
         {
-            const int WM_MOUSEACTIVATE = 0x21;
-            const int HTCAPTION = 2;
-            const int WM_LBUTTONDOWN = 0x201;
+            const int WM_MDIACTIVATE = 0x0222;
 
-            SendMessage(windowHandle, WM_MOUSEACTIVATE, parentWindowHandle, new IntPtr(HTCAPTION + WM_LBUTTONDOWN * 0x10000));
+            SendMessage(parentWindowHandle, WM_MDIACTIVATE, windowHandle, IntPtr.Zero);
         }
 
         internal static void EnumChildWindows(IntPtr parentWindowHandle, EnumChildWindowsDelegate callBackEnumWindows)

Original file line number	Diff line number	Diff line change
`@@ -84,11 +84,9 @@ internal static string GetWindowTextByHwnd(IntPtr windowHandle)`
`84`	`84`	`/// <param name="parentWindowHandle"> Handle of the parent window. </param>`
`85`	`85`	`internal static void ActivateWindow(IntPtr windowHandle, IntPtr parentWindowHandle)`
`86`	`86`	`{`
`87`		`- const int WM_MOUSEACTIVATE = 0x21;`
`88`		`- const int HTCAPTION = 2;`
`89`		`- const int WM_LBUTTONDOWN = 0x201;`
	`87`	`+ const int WM_MDIACTIVATE = 0x0222;`
`90`	`88`
`91`		`- SendMessage(windowHandle, WM_MOUSEACTIVATE, parentWindowHandle, new IntPtr(HTCAPTION + WM_LBUTTONDOWN * 0x10000));`
	`89`	`+ SendMessage(parentWindowHandle, WM_MDIACTIVATE, windowHandle, IntPtr.Zero);`
`92`	`90`	`}`
`93`	`91`
`94`	`92`	`internal static void EnumChildWindows(IntPtr parentWindowHandle, EnumChildWindowsDelegate callBackEnumWindows)`