Просмотр исходного кода

fixes label bug and draw method name

svn path=/trunk/mcs/; revision=32024
Jordi Mas i Hernandez 21 лет назад
Родитель
Сommit
d292d296f8

+ 2 - 2
mcs/class/Managed.Windows.Forms/System.Windows.Forms/Label.cs

@@ -454,7 +454,7 @@ namespace System.Windows.Forms
     		 	Console.WriteLine ("CalcAutoSize () after " + Size);
     		}
 
-    		protected virtual void draw ()
+    		protected virtual void Draw ()
 		{
 			ThemeEngine.Current.DrawLabel (dc_mem, paint_area, BorderStyle, Text, 
 				ForeColor, BackColor, Font, string_format, Enabled);
@@ -478,7 +478,7 @@ namespace System.Windows.Forms
 
 			/* Copies memory drawing buffer to screen*/
 			UpdateArea ();
-			draw();
+			Draw ();
 			pevent.Graphics.DrawImage (bmp_mem, 0, 0);
 
 		}

+ 5 - 2
mcs/class/Managed.Windows.Forms/System.Windows.Forms/LinkLabel.cs

@@ -30,9 +30,12 @@
 //	- Change the cursor to a hand cursor when you are over a link (when cursors are available)
 //
 //
-// $Revision: 1.3 $
+// $Revision: 1.4 $
 // $Modtime: $
 // $Log: LinkLabel.cs,v $
+// Revision 1.4  2004/08/07 23:31:15  jordi
+// fixes label bug and draw method name
+//
 // Revision 1.3  2004/08/07 19:16:31  jordi
 // throw exceptions, fixes events, missing methods
 //
@@ -450,7 +453,7 @@ namespace System.Windows.Forms
 			}
 		}
 
-		protected override void draw ()
+		protected override void Draw ()
 		{
 			Color color;
 

+ 6 - 3
mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs

@@ -25,9 +25,12 @@
 //
 //
 //
-// $Revision: 1.3 $
+// $Revision: 1.4 $
 // $Modtime: $
 // $Log: ThemeWin32Classic.cs,v $
+// Revision 1.4  2004/08/07 23:31:15  jordi
+// fixes label bug and draw method name
+//
 // Revision 1.3  2004/08/07 19:05:44  jordi
 // Theme colour support and GetSysColor defines
 //
@@ -1404,10 +1407,10 @@ namespace System.Windows.Forms
 			Color fore_color, Color back_color, Font font, StringFormat string_format, bool Enabled)
 
 		{	
-			if (label_br_fore_color.Color != fore_color) 
+			if (label_br_fore_color == null || label_br_fore_color.Color != fore_color) 
 				label_br_fore_color = new SolidBrush (fore_color);
 
-			if (label_br_back_color.Color != back_color) 
+			if (label_br_back_color == null || label_br_back_color.Color != back_color) 
 				label_br_back_color = new SolidBrush (back_color);
 
 			dc.FillRectangle (label_br_back_color, area);