Author: pbartok
Date: 2006-06-21 19:18:37 -0400 (Wed, 21 Jun 2006)
New Revision: 61922

Modified:
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUI.cs
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIDriver.cs
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIOSX.cs
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIWin32.cs
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIX11.cs
Log:
2006-06-21  Peter Dennis Bartok  <[EMAIL PROTECTED]> 

        * Control.cs (ContainsFocus): Using new driver method to get focused
          window, instead of trying to use internal tracking var, which can
          recursion issues (Fixes #78685)
        * XplatUI.cs, XplatUIDriver.cs, XplatUIX11.cs, XplatUIOSX.cs, 
          XplatUIWin32.cs: Added GetFocus method to return focused window



Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2006-06-21 22:10:30 UTC (rev 61921)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2006-06-21 23:18:37 UTC (rev 61922)
@@ -1,3 +1,11 @@
+2006-06-21  Peter Dennis Bartok  <[EMAIL PROTECTED]> 
+
+       * Control.cs (ContainsFocus): Using new driver method to get focused
+         window, instead of trying to use internal tracking var, which can
+         recursion issues (Fixes #78685)
+       * XplatUI.cs, XplatUIDriver.cs, XplatUIX11.cs, XplatUIOSX.cs, 
+         XplatUIWin32.cs: Added GetFocus method to return focused window
+
 2006-06-21 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
 
        * ColorDialog.cs: when the mouse button is pressed inside the color

Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs       
2006-06-21 22:10:30 UTC (rev 61921)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs       
2006-06-21 23:18:37 UTC (rev 61922)
@@ -1709,14 +1709,19 @@
                
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
                public bool ContainsFocus {
                        get {
-                               if (this.Focused) {
-                                       return true;
-                               }
+                               IntPtr  focused_window;
 
-                               for (int i=0; i < child_controls.Count; i++) {
-                                       if (child_controls[i].ContainsFocus) {
+                               focused_window = XplatUI.GetFocus();
+                               if (IsHandleCreated) {
+                                       if (focused_window == Handle) {
                                                return true;
                                        }
+
+                                       for (int i=0; i < child_controls.Count; 
i++) {
+                                               if 
(child_controls[i].ContainsFocus) {
+                                                       return true;
+                                               }
+                                       }
                                }
                                return false;
                        }

Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUI.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUI.cs       
2006-06-21 22:10:30 UTC (rev 61921)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUI.cs       
2006-06-21 23:18:37 UTC (rev 61922)
@@ -490,6 +490,13 @@
                        driver.GetDisplaySize(out size);
                }
 
+               internal static IntPtr GetFocus() {
+                       #if DriverDebug
+                               Console.WriteLine("GetFocus(): Called, 
Result:{0}", Window(driver.GetFocus()));
+                       #endif
+                       return driver.GetFocus();
+               }
+
                internal static bool GetFontMetrics(Graphics g, Font font, out 
int ascent, out int descent) {
                        #if DriverDebug
                                Console.WriteLine("GetFontMetrics(): Called");

Modified: 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIDriver.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIDriver.cs 
2006-06-21 22:10:30 UTC (rev 61921)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIDriver.cs 
2006-06-21 23:18:37 UTC (rev 61922)
@@ -237,6 +237,7 @@
                internal abstract void SetCaretPos(IntPtr hwnd, int x, int y);
                internal abstract void CaretVisible(IntPtr hwnd, bool visible);
 
+               internal abstract IntPtr GetFocus();
                internal abstract void SetFocus(IntPtr hwnd);
                internal abstract IntPtr GetActive();
 

Modified: 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIOSX.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIOSX.cs    
2006-06-21 22:10:30 UTC (rev 61921)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIOSX.cs    
2006-06-21 23:18:37 UTC (rev 61922)
@@ -1185,6 +1185,11 @@
                        x = pt.x;
                        y = pt.y;
                }
+
+               internal override IntPtr GetFocus() {
+                       return FocusWindow;
+               }
+
                
                internal override bool GetFontMetrics(Graphics g, Font font, 
out int ascent, out int descent) {
                        return GetFontMetrics(g.GetHdc(), font.ToHfont(), out 
ascent, out descent);

Modified: 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIWin32.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIWin32.cs  
2006-06-21 22:10:30 UTC (rev 61921)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIWin32.cs  
2006-06-21 23:18:37 UTC (rev 61922)
@@ -1868,6 +1868,10 @@
                        }
                }
 
+               internal override IntPtr GetFocus() {
+                       return Win32GetFocus();
+               }
+
                internal override void SetFocus(IntPtr hwnd) {
                        Win32SetFocus(hwnd);
                }
@@ -2500,6 +2504,9 @@
                [DllImport ("user32.dll", EntryPoint="SetFocus", 
CallingConvention=CallingConvention.StdCall)]
                internal extern static IntPtr Win32SetFocus(IntPtr hwnd);
 
+               [DllImport ("user32.dll", EntryPoint="GetFocus", 
CallingConvention=CallingConvention.StdCall)]
+               internal extern static IntPtr Win32GetFocus();
+
                [DllImport ("user32.dll", EntryPoint="CreateCaret", 
CallingConvention=CallingConvention.StdCall)]
                internal extern static bool Win32CreateCaret(IntPtr hwnd, 
IntPtr hBitmap, int nWidth, int nHeight);
 

Modified: 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIX11.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIX11.cs    
2006-06-21 22:10:30 UTC (rev 61921)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIX11.cs    
2006-06-21 23:18:37 UTC (rev 61922)
@@ -2867,6 +2867,11 @@
                        }
                }
 
+               internal override IntPtr GetFocus() {
+                       return FocusWindow;
+               }
+
+
                internal override bool GetFontMetrics(Graphics g, Font font, 
out int ascent, out int descent) {
                        return GetFontMetrics(g.GetHdc(), font.ToHfont(), out 
ascent, out descent);
                }

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to