2005-06-21 Peter Bartok <pbartok@novell.com>

[mono.git] / mcs / class / Managed.Windows.Forms / System.Windows.Forms / Form.cs

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
index 44d171f1aaf127b52f193646096e17f032221cd8..d2b04135eb3eca5de7e8a668cd4d47b1277c0ff7 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
@@ -1317,11 +1317,10 @@ namespace System.Windows.Forms {
                                }
 
                                case Msg.WM_SETFOCUS: {
-#if not
                                        if (this.ActiveControl != null) {
                                                ActiveControl.Focus();
+                                               return; // FIXME - do we need to run base.WndProc, even though we just changed focus?
                                        }
-#endif
                                        base.WndProc(ref m);
                                        return;
                                }