Merge pull request #1850 from rubberduck-vba/revert-1848-next

retailcoder · web-flow · commit 9a442d71cc69 · 2016-06-17T11:29:11.000-04:00
Revert "Changed ActivateWindow to send WM_MDIACTIVATE instead of simulated mo…"
diff --git a/Rubberduck.VBEEditor/NativeMethods.cs b/Rubberduck.VBEEditor/NativeMethods.cs
@@ -84,9 +84,11 @@ 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_MDIACTIVATE = 0x0222;
+            const int WM_MOUSEACTIVATE = 0x21;
+            const int HTCAPTION = 2;
+            const int WM_LBUTTONDOWN = 0x201;
 
-            SendMessage(parentWindowHandle, WM_MDIACTIVATE, windowHandle, IntPtr.Zero);
+            SendMessage(windowHandle, WM_MOUSEACTIVATE, parentWindowHandle, new IntPtr(HTCAPTION + WM_LBUTTONDOWN * 0x10000));
         }
 
         internal static void EnumChildWindows(IntPtr parentWindowHandle, EnumChildWindowsDelegate callBackEnumWindows)

Original file line number	Diff line number	Diff line change
`@@ -84,9 +84,11 @@ 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_MDIACTIVATE = 0x0222;`
	`87`	`+ const int WM_MOUSEACTIVATE = 0x21;`
	`88`	`+ const int HTCAPTION = 2;`
	`89`	`+ const int WM_LBUTTONDOWN = 0x201;`
`88`	`90`
`89`		`- SendMessage(parentWindowHandle, WM_MDIACTIVATE, windowHandle, IntPtr.Zero);`
	`91`	`+ SendMessage(windowHandle, WM_MOUSEACTIVATE, parentWindowHandle, new IntPtr(HTCAPTION + WM_LBUTTONDOWN * 0x10000));`
`90`	`92`	`}`
`91`	`93`
`92`	`94`	`internal static void EnumChildWindows(IntPtr parentWindowHandle, EnumChildWindowsDelegate callBackEnumWindows)`