Author: gnorton
Date: 2008-02-14 12:40:35 -0500 (Thu, 14 Feb 2008)
New Revision: 95670
Modified:
branches/mono-1-9/mcs/class/Managed.Windows.Forms/System.Windows.Forms.CarbonInternal/ChangeLog
branches/mono-1-9/mcs/class/Managed.Windows.Forms/System.Windows.Forms.CarbonInternal/WindowHandler.cs
Log:
In .:
2008-02-14 Geoff Norton <[EMAIL PROTECTED]>
* WindowHandler.cs: Ensure we send WM_ACTIVATE when we activate our
Form. Fixes #360721
Modified:
branches/mono-1-9/mcs/class/Managed.Windows.Forms/System.Windows.Forms.CarbonInternal/ChangeLog
===================================================================
---
branches/mono-1-9/mcs/class/Managed.Windows.Forms/System.Windows.Forms.CarbonInternal/ChangeLog
2008-02-14 17:39:43 UTC (rev 95669)
+++
branches/mono-1-9/mcs/class/Managed.Windows.Forms/System.Windows.Forms.CarbonInternal/ChangeLog
2008-02-14 17:40:35 UTC (rev 95670)
@@ -1,3 +1,8 @@
+2008-02-14 Geoff Norton <[EMAIL PROTECTED]>
+
+ * WindowHandler.cs: Ensure we send WM_ACTIVATE when we activate our
+ Form. Fixes #360721
+
2008-02-04 Geoff Norton <[EMAIL PROTECTED]>
* KeyboardHandler.cs: [Backport fix] msg != msg.message
Modified:
branches/mono-1-9/mcs/class/Managed.Windows.Forms/System.Windows.Forms.CarbonInternal/WindowHandler.cs
===================================================================
---
branches/mono-1-9/mcs/class/Managed.Windows.Forms/System.Windows.Forms.CarbonInternal/WindowHandler.cs
2008-02-14 17:39:43 UTC (rev 95669)
+++
branches/mono-1-9/mcs/class/Managed.Windows.Forms/System.Windows.Forms.CarbonInternal/WindowHandler.cs
2008-02-14 17:40:35 UTC (rev 95670)
@@ -117,6 +117,16 @@
switch (kind) {
case kEventWindowExpanding:
case kEventWindowActivated:
+ if (XplatUICarbon.FocusWindow
== IntPtr.Zero) {
+ Control c =
Control.FromHandle (hwnd.client_window);
+ if (c != null) {
+ Form form =
c.FindForm ();
+ if (form !=
null) {
+
Driver.SendMessage (form.Handle, Msg.WM_ACTIVATE, (IntPtr)
WindowActiveFlags.WA_ACTIVE, IntPtr.Zero);
+ }
+ }
+ }
+
foreach (IntPtr utility_window
in XplatUICarbon.UtilityWindows) {
if (utility_window !=
handle && !XplatUICarbon.IsWindowVisible (utility_window))
XplatUICarbon.ShowWindow (utility_window);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
