Author: rolf
Date: 2007-07-20 13:41:41 -0400 (Fri, 20 Jul 2007)
New Revision: 82374
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs
Log:
* Form.cs: Don't check if the current form is the active form before
activating it. Fixes #81904.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-07-20 17:38:42 UTC (rev 82373)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-07-20 17:41:41 UTC (rev 82374)
@@ -5,6 +5,11 @@
2007-07-20 Rolf Bjarne Kvinge <[EMAIL PROTECTED]>
+ * Form.cs: Don't check if the current form is the active form before
+ activating it. Fixes #81904.
+
+2007-07-20 Rolf Bjarne Kvinge <[EMAIL PROTECTED]>
+
* TreeView.cs: Apply patch from Tyron ([EMAIL PROTECTED]). Fixes #81847.
2007-07-20 Rolf Bjarne Kvinge <[EMAIL PROTECTED]>
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs
2007-07-20 17:38:42 UTC (rev 82373)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs
2007-07-20 17:41:41 UTC (rev 82374)
@@ -4572,7 +4572,7 @@
format.Alignment = StringAlignment.Center;
else
format.Alignment = StringAlignment.Near;
-
+#if !NET_2_0
if (control is PropertyGrid.PropertyToolBar) {
dc.FillRectangle
(ResPool.GetSolidBrush(control.BackColor), clip_rectangle);
@@ -4592,7 +4592,7 @@
dc.DrawLine (SystemPens.ControlDark,
clip_rectangle.Right - 1, 1, clip_rectangle.Right - 1, control.Bottom - 1);
}
} else {
-
+#endif
if (control.Appearance ==
ToolBarAppearance.Flat && control.Parent != null) {
if (control.Parent.BackgroundImage !=
null) {
using (TextureBrush b = new
TextureBrush (control.Parent.BackgroundImage, WrapMode.Tile))
@@ -4610,7 +4610,9 @@
}
dc.DrawLine
(SystemPens.ControlLightLight, clip_rectangle.X, 1, clip_rectangle.Right, 1);
}
+#if !NET_2_0
}
+#endif
foreach (ToolBarItem item in control.items)
if (item.Button.Visible &&
clip_rectangle.IntersectsWith (item.Rectangle))
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches