Author: rolf
Date: 2007-04-24 11:37:18 -0400 (Tue, 24 Apr 2007)
New Revision: 76194

Modified:
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MdiClient.cs
Log:
* ThemeWin32Classic.cs: Use a black pen to draw checkboxes, fixes
  #81406.

Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2007-04-24 14:56:49 UTC (rev 76193)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2007-04-24 15:37:18 UTC (rev 76194)
@@ -5,6 +5,11 @@
 
 2007-04-24  Rolf Bjarne Kvinge <[EMAIL PROTECTED]> 
 
+       * ThemeWin32Classic.cs: Use a black pen to draw checkboxes, fixes
+         #81406.
+
+2007-04-24  Rolf Bjarne Kvinge <[EMAIL PROTECTED]> 
+
        * MaskedTextBox.cs: Commit this so nobody else starts working on it and
          avoid duplicate work. Mostily skeleton code, it's not working at
          all yet.

Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs  
2007-04-24 14:56:49 UTC (rev 76193)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs  
2007-04-24 15:37:18 UTC (rev 76194)
@@ -125,6 +125,10 @@
                        return cea.Cancel;
 #endif
                }
+               internal void OnActivatedInternal ()
+               {
+                       OnActivated (EventArgs.Empty);
+               }
                
                private void SelectActiveControl ()
                {
@@ -1158,7 +1162,10 @@
                                cp.Width = Width;
                                cp.Height = Height;
 
-                               cp.Style = (int)(WindowStyles.WS_CLIPCHILDREN | 
WindowStyles.WS_CLIPSIBLINGS);
+                               cp.Style = (int)(WindowStyles.WS_CLIPCHILDREN);
+                               if (!Modal) {
+                                       cp.WindowStyle |= 
WindowStyles.WS_CLIPSIBLINGS;
+                               }
 
                                if (Parent != null) {
                                        cp.Parent = Parent.Handle;

Modified: 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MdiClient.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MdiClient.cs     
2007-04-24 14:56:49 UTC (rev 76193)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MdiClient.cs     
2007-04-24 15:37:18 UTC (rev 76194)
@@ -685,8 +685,13 @@
                        }
                        active_child = (Form) Controls [0];
                        
-                       if (active_child.Visible)
+                       if (active_child.Visible) {
+                               bool raise_activated = ParentForm.ActiveControl 
!= active_child;
                                ParentForm.ActiveControl = active_child;
+                               if (raise_activated) {
+                                       active_child.OnActivatedInternal ();
+                               }
+                       }
                }
 
                internal override IntPtr AfterTopMostControl ()

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

Reply via email to