Author: jpobst
Date: 2007-11-07 15:46:10 -0500 (Wed, 07 Nov 2007)
New Revision: 89162

Modified:
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
   
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs
Log:
2007-11-07  Jonathan Pobst  <[EMAIL PROTECTED]>

        * ThemeWin32Classic.cs: Don't draw the background in DrawLabel or
        DrawLinkLabel, this is handled by OnPaintBackground.
        Fixes bug #339565, part II.

Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2007-11-07 20:40:19 UTC (rev 89161)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2007-11-07 20:46:10 UTC (rev 89162)
@@ -1,3 +1,9 @@
+2007-11-07  Jonathan Pobst  <[EMAIL PROTECTED]>
+
+       * ThemeWin32Classic.cs: Don't draw the background in DrawLabel or
+       DrawLinkLabel, this is handled by OnPaintBackground.
+       Fixes bug #339565, part II.
+
 2007-11-07  Andreia Gaita <[EMAIL PROTECTED]>
 
        * Control.cs: Revert r88915. Selecting text on a textbox depends on

Modified: 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs
===================================================================
--- 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs 
    2007-11-07 20:40:19 UTC (rev 89161)
+++ 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs 
    2007-11-07 20:46:10 UTC (rev 89162)
@@ -2322,8 +2322,6 @@
                #region Label
                public  override void DrawLabel (Graphics dc, Rectangle 
clip_rectangle, Label label) 
                {               
-                       dc.FillRectangle (GetControlBackBrush 
(label.BackColor), clip_rectangle);
-
                        label.DrawImage (dc, label.Image, 
label.ClientRectangle, label.ImageAlign);
 
                        if (label.Enabled) {
@@ -2331,7 +2329,6 @@
                        } else {
                                ControlPaint.DrawStringDisabled (dc, 
label.Text, label.Font, label.BackColor, clip_rectangle, label.string_format);
                        }
-               
                }
 
                public override Size LabelDefaultSize {
@@ -2365,8 +2362,6 @@
                
                public override void DrawLinkLabel (Graphics dc, Rectangle 
clip_rectangle, LinkLabel label)
                {
-                       dc.FillRectangle (GetControlBackBrush 
(label.BackColor), clip_rectangle);
-
                        label.DrawImage (dc, label.Image, 
label.ClientRectangle, label.ImageAlign);
 
                        if (label.pieces == null)

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

Reply via email to