Author: toshok
Date: 2006-10-31 18:41:18 -0500 (Tue, 31 Oct 2006)
New Revision: 67197

Modified:
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/UpDownBase.cs
Log:
        * UpDownBase.cs: remove the OnGotFocusInternal/OnLostFocusInternal
        calls for the textbox/spinner, to keep from recursing to the point
        where we crash.  Fixes #79760.

2006-10-31  Chris Toshok  <[EMAIL PROTECTED]>



Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2006-10-31 22:33:54 UTC (rev 67196)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2006-10-31 23:41:18 UTC (rev 67197)
@@ -1,5 +1,11 @@
 2006-10-31  Chris Toshok  <[EMAIL PROTECTED]>
 
+       * UpDownBase.cs: remove the OnGotFocusInternal/OnLostFocusInternal
+       calls for the textbox/spinner, to keep from recursing to the point
+       where we crash.  Fixes #79760.
+
+2006-10-31  Chris Toshok  <[EMAIL PROTECTED]>
+
        * ListControl.cs (set_SelectedValue): don't throw exceptions on
        null/"" value, just return.  matches ms's behavior and fixes some
        failing tests.

Modified: 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/UpDownBase.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/UpDownBase.cs    
2006-10-31 22:33:54 UTC (rev 67196)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/UpDownBase.cs    
2006-10-31 23:41:18 UTC (rev 67197)
@@ -226,16 +226,6 @@
                        {
                                SetStyle (ControlStyles.Selectable, selectable);
                        }
-
-                       internal override void OnGotFocusInternal (EventArgs e)
-                       {
-                               owner.Select (false, true);
-                       }
-
-                       internal override void OnLostFocusInternal (EventArgs e)
-                       {
-                               owner.Select (false, true);
-                       }
                }
                #endregion      // UpDownSpinner Sub-class
 
@@ -262,17 +252,6 @@
                                else
                                        document.CaretLostFocus ();
                        }
-
-                       
-                       internal override void OnGotFocusInternal (EventArgs e)
-                       {
-                               owner.Select (false, true);
-                       }
-
-                       internal override void OnLostFocusInternal (EventArgs e)
-                       {
-                               owner.Select (false, true);
-                       }                       
                }
 
                #region Local Variables
@@ -381,6 +360,7 @@
                        txtView.SetSelectable (true);
                        spnSpinner.SetSelectable (true);
                }
+
                #endregion      // Private Methods
 
                #region Public Instance Properties
@@ -725,8 +705,10 @@
                        case Msg.WM_CHAR:
                                XplatUI.SendMessage (txtView.Handle, (Msg) 
m.Msg, m.WParam, m.LParam);
                                break;
+                       default:
+                               base.WndProc (ref m);
+                               break;
                        }
-                       base.WndProc (ref m);
                }
                #endregion      // Protected Instance Methods
 

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

Reply via email to