Author: toshok
Date: 2006-12-06 20:28:17 -0500 (Wed, 06 Dec 2006)
New Revision: 69150
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListView.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/RichTextBox.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs
Log:
* ListView.cs: the BackgroundImage override is just to set
attributes. chain up to base.BackgroundImage.
* RichTextBox.cs: same.
* ToolBar.cs: same, but we need to also redraw the toolbar when it
changes, so instead a handler for BackgroundImageChanged.
* Control.cs: make background_image private.
2006-12-06 Chris Toshok <[EMAIL PROTECTED]>
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2006-12-07 01:21:33 UTC (rev 69149)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2006-12-07 01:28:17 UTC (rev 69150)
@@ -1,5 +1,17 @@
2006-12-06 Chris Toshok <[EMAIL PROTECTED]>
+ * ListView.cs: the BackgroundImage override is just to set
+ attributes. chain up to base.BackgroundImage.
+
+ * RichTextBox.cs: same.
+
+ * ToolBar.cs: same, but we need to also redraw the toolbar when it
+ changes, so instead a handler for BackgroundImageChanged.
+
+ * Control.cs: make background_image private.
+
+2006-12-06 Chris Toshok <[EMAIL PROTECTED]>
+
* ScrollBar.cs: change the assignment of cursor to Cursor. not
sure we even need this assignment, but roll with it for now.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
2006-12-07 01:21:33 UTC (rev 69149)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
2006-12-07 01:28:17 UTC (rev 69150)
@@ -95,7 +95,7 @@
// Visuals
internal Color foreground_color; //
foreground color for control
internal Color background_color; //
background color for control
- internal Image background_image; //
background image for control
+ Image background_image; // background image for control
internal Font font; // font
for control
string text; // window/title text for control
internal BorderStyle border_style; //
Border style of control
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListView.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListView.cs
2006-12-07 01:21:33 UTC (rev 69149)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListView.cs
2006-12-07 01:28:17 UTC (rev 69150)
@@ -303,14 +303,8 @@
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
public override Image BackgroundImage {
- get { return background_image; }
- set {
- if (value == background_image)
- return;
-
- background_image = value;
- OnBackgroundImageChanged (EventArgs.Empty);
- }
+ get { return base.BackgroundImage; }
+ set { base.BackgroundImage = value; }
}
[DefaultValue (BorderStyle.Fixed3D)]
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/RichTextBox.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/RichTextBox.cs
2006-12-07 01:21:33 UTC (rev 69149)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/RichTextBox.cs
2006-12-07 01:28:17 UTC (rev 69150)
@@ -137,13 +137,8 @@
[Browsable(false)]
[EditorBrowsable(EditorBrowsableState.Never)]
public override System.Drawing.Image BackgroundImage {
- get {
- return background_image;
- }
-
- set {
- base.BackgroundImage = value;
- }
+ get { return base.BackgroundImage; }
+ set { base.BackgroundImage = value; }
}
[DefaultValue(0)]
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs
2006-12-07 01:21:33 UTC (rev 69149)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs
2006-12-07 01:28:17 UTC (rev 69150)
@@ -130,6 +130,7 @@
MouseLeave += new EventHandler (ToolBar_MouseLeave);
MouseMove += new MouseEventHandler (ToolBar_MouseMove);
MouseUp += new MouseEventHandler (ToolBar_MouseUp);
+ BackgroundImageChanged += new EventHandler
(ToolBar_BackgroundImageChanged);
TabStop = false;
@@ -201,15 +202,8 @@
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
public override Image BackgroundImage {
- get { return background_image; }
- set {
- if (value == background_image)
- return;
-
- background_image = value;
- OnBackgroundImageChanged (EventArgs.Empty);
- Redraw (false);
- }
+ get { return base.BackgroundImage; }
+ set { base.BackgroundImage = value; }
}
[DefaultValue (BorderStyle.None)]
@@ -500,7 +494,7 @@
if (Width <= 0 || Height <= 0 || !Visible)
return;
- Redraw (true, background_image != null);
+ Redraw (true, BackgroundImage != null);
}
int requested_height = -1;
@@ -604,6 +598,11 @@
(enabled [next] as ToolBarButton).Hilight = true;
}
+ private void ToolBar_BackgroundImageChanged (object sender,
EventArgs args)
+ {
+ Redraw (false);
+ }
+
private void ToolBar_MouseDown (object sender, MouseEventArgs
me)
{
if ((!Enabled) || ((me.Button & MouseButtons.Left) ==
0))
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
