Author: rolf
Date: 2007-05-31 12:00:31 -0400 (Thu, 31 May 2007)
New Revision: 78342
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/MaskedTextBox.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MessageBox.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ProgressBar.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyGrid.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/RichTextBox.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/WebBrowserBase.cs
Log:
* ProgressBar.cs, WebBrowserBase.cs, Control.cs, MaskedTextBox.cs,
MessageBox.cs, PropertyGrid.cs, RichTextBox.cs: Fix warnings and
corcompare issues.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-05-31 15:46:35 UTC (rev 78341)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-05-31 16:00:31 UTC (rev 78342)
@@ -1,5 +1,11 @@
2007-05-31 Rolf Bjarne Kvinge <[EMAIL PROTECTED]>
+ * ProgressBar.cs, WebBrowserBase.cs, Control.cs, MaskedTextBox.cs,
+ MessageBox.cs, PropertyGrid.cs, RichTextBox.cs: Fix warnings and
+ corcompare issues.
+
+2007-05-31 Rolf Bjarne Kvinge <[EMAIL PROTECTED]>
+
* ProgressBar.cs: Implemented missing 2.0 members.
2007-05-31 Rolf Bjarne Kvinge <[EMAIL PROTECTED]>
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
2007-05-31 15:46:35 UTC (rev 78341)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
2007-05-31 16:00:31 UTC (rev 78342)
@@ -3218,9 +3218,8 @@
#region Protected Instance Properties
#if NET_2_0
- // XXX - override once exists in System.Component
// Is only false in some ActiveX contexts
- protected bool CanRaiseEvents {
+ protected override bool CanRaiseEvents {
get { return true; }
}
#endif
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MaskedTextBox.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MaskedTextBox.cs
2007-05-31 15:46:35 UTC (rev 78341)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MaskedTextBox.cs
2007-05-31 16:00:31 UTC (rev 78342)
@@ -174,13 +174,13 @@
}
[EditorBrowsable (EditorBrowsableState.Never)]
- public int GetFirstCharIndexFromLine (int lineNumber)
+ public new int GetFirstCharIndexFromLine (int lineNumber)
{
return 0;
}
[EditorBrowsable (EditorBrowsableState.Never)]
- public int GetFirstCharIndexOfCurrentLine ()
+ public new int GetFirstCharIndexOfCurrentLine ()
{
return 0;
}
@@ -663,7 +663,6 @@
return provider.ToString ();
}
set {
- string initial_text = Text;
if (is_empty_mask) {
setting_text = true;
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MessageBox.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MessageBox.cs
2007-05-31 15:46:35 UTC (rev 78341)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MessageBox.cs
2007-05-31 16:00:31 UTC (rev 78342)
@@ -151,7 +151,7 @@
#endregion // Protected Instance Properties
#region MessageBoxForm Methods
- internal void SetHelpData (string file_path, string
keyword, HelpNavigator navigator, object param)
+ public void SetHelpData (string file_path, string
keyword, HelpNavigator navigator, object param)
{
help_file_path = file_path;
help_keyword = keyword;
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ProgressBar.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ProgressBar.cs
2007-05-31 15:46:35 UTC (rev 78341)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ProgressBar.cs
2007-05-31 16:00:31 UTC (rev 78342)
@@ -86,7 +86,7 @@
#if NET_2_0
[Browsable(false)]
[EditorBrowsable(EditorBrowsableState.Never)]
- public event EventHandler BackgroundImageLayoutChanged {
+ public new event EventHandler BackgroundImageLayoutChanged {
add { base.BackgroundImageLayoutChanged += value; }
remove { base.BackgroundImageLayoutChanged -= value; }
}
@@ -167,14 +167,14 @@
#if NET_2_0
[EditorBrowsable(EditorBrowsableState.Never)]
[Browsable(false)]
- public event MouseEventHandler MouseDoubleClick {
+ public new event MouseEventHandler MouseDoubleClick {
add { base.MouseDoubleClick += value; }
remove { base.MouseDoubleClick -= value; }
}
[Browsable(false)]
[EditorBrowsable(EditorBrowsableState.Never)]
- public event EventHandler PaddingChanged {
+ public new event EventHandler PaddingChanged {
add { base.PaddingChanged += value; }
remove { base.PaddingChanged -= value; }
}
@@ -381,7 +381,7 @@
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
[Browsable(false)]
[EditorBrowsable(EditorBrowsableState.Never)]
- public Padding Padding {
+ public new Padding Padding {
get { return base.Padding; }
set { base.Padding = value; }
}
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyGrid.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyGrid.cs
2007-05-31 15:46:35 UTC (rev 78341)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyGrid.cs
2007-05-31 16:00:31 UTC (rev 78342)
@@ -252,6 +252,14 @@
}
}
+#if NET_2_0
+ [EditorBrowsable(EditorBrowsableState.Never)]
+ [Browsable(false)]
+ public override ImageLayout BackgroundImageLayout {
+ get { return base.BackgroundImageLayout; }
+ set { base.BackgroundImageLayout = value; }
+ }
+#endif
[BrowsableAttribute(false)]
[EditorBrowsableAttribute(EditorBrowsableState.Advanced)]
@@ -425,6 +433,16 @@
}
}
+#if NET_2_0
+ [EditorBrowsable(EditorBrowsableState.Never)]
+ [Browsable(false)]
+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+ public new Padding Padding {
+ get { return base.Padding; }
+ set { base.Padding = value; }
+ }
+#endif
+
[DefaultValue(PropertySort.CategorizedAlphabetical)]
public PropertySort PropertySort {
get {
@@ -737,6 +755,13 @@
eh (this, e);
}
+#if NET_2_0
+ protected override void OnEnabledChanged (EventArgs e) {
+ base.OnEnabledChanged (e);
+ }
+
+#endif
+
protected override void OnFontChanged(EventArgs e) {
base.OnFontChanged (e);
}
@@ -774,6 +799,14 @@
base.OnPaint (pevent);
}
+#if NET_2_0
+ protected virtual void OnPropertySortChanged(EventArgs e) {
+ EventHandler eh = (EventHandler) Events
[PropertySortChangedEvent];
+ if (eh != null)
+ eh (this, e);
+ }
+#endif
+
[MonoTODO]
protected virtual void OnPropertyTabChanged
(PropertyTabChangedEventArgs e) {
throw new NotImplementedException();
@@ -871,12 +904,91 @@
remove { base.BackgroundImageChanged -= value; }
}
+#if NET_2_0
[Browsable(false)]
[EditorBrowsable(EditorBrowsableState.Never)]
+ public new event EventHandler BackgroundImageLayoutChanged {
+ add { base.BackgroundImageLayoutChanged += value; }
+ remove { base.BackgroundImageLayoutChanged -= value; }
+ }
+#endif
+
+ [Browsable(false)]
+ [EditorBrowsable(EditorBrowsableState.Never)]
public new event EventHandler ForeColorChanged {
add { base.ForeColorChanged += value; }
remove { base.ForeColorChanged -= value; }
}
+#if NET_2_0
+ [EditorBrowsable(EditorBrowsableState.Advanced)]
+ [Browsable(false)]
+ public new event KeyEventHandler KeyDown {
+ add { base.KeyDown += value; }
+ remove { base.KeyDown -= value; }
+ }
+
+ [Browsable(false)]
+ [EditorBrowsable(EditorBrowsableState.Advanced)]
+ public new event KeyPressEventHandler KeyPress {
+ add { base.KeyPress += value; }
+ remove { base.KeyPress -= value; }
+ }
+
+ [EditorBrowsable(EditorBrowsableState.Advanced)]
+ [Browsable(false)]
+ public new event KeyEventHandler KeyUp {
+ add { base.KeyUp += value; }
+ remove { base.KeyUp -= value; }
+ }
+
+ [Browsable(false)]
+ [EditorBrowsable(EditorBrowsableState.Advanced)]
+ public new event MouseEventHandler MouseDown {
+ add { base.MouseDown += value; }
+ remove { base.MouseDown -= value; }
+ }
+
+ [EditorBrowsable(EditorBrowsableState.Advanced)]
+ [Browsable(false)]
+ public new event EventHandler MouseEnter {
+ add { base.MouseEnter += value; }
+ remove { base.MouseEnter -= value; }
+ }
+
+ [EditorBrowsable(EditorBrowsableState.Advanced)]
+ [Browsable(false)]
+ public new event EventHandler MouseLeave {
+ add { base.MouseLeave += value; }
+ remove { base.MouseLeave -= value; }
+ }
+
+ [EditorBrowsable(EditorBrowsableState.Advanced)]
+ [Browsable(false)]
+ public new event MouseEventHandler MouseMove {
+ add { base.MouseMove += value; }
+ remove { base.MouseMove -= value; }
+ }
+
+ [EditorBrowsable(EditorBrowsableState.Advanced)]
+ [Browsable(false)]
+ public new event MouseEventHandler MouseUp {
+ add { base.MouseUp += value; }
+ remove { base.MouseUp -= value; }
+ }
+
+ [Browsable(false)]
+ [EditorBrowsable(EditorBrowsableState.Never)]
+ public new event EventHandler PaddingChanged {
+ add { base.PaddingChanged += value; }
+ remove { base.PaddingChanged -= value; }
+ }
+
+ [Browsable(false)]
+ public new event EventHandler TextChanged {
+ add { base.TextChanged += value; }
+ remove { base.TextChanged -= value; }
+ }
+#endif
#endregion
#region Com2Interop.IComPropertyBrowser Interface
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/RichTextBox.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/RichTextBox.cs
2007-05-31 15:46:35 UTC (rev 78341)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/RichTextBox.cs
2007-05-31 16:00:31 UTC (rev 78342)
@@ -1050,7 +1050,7 @@
}
#if NET_2_0
- public void DrawToBitmap (Bitmap bitmap, Rectangle clip)
+ public new void DrawToBitmap (Bitmap bitmap, Rectangle clip)
{
Graphics dc = Graphics.FromImage (bitmap);
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/WebBrowserBase.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/WebBrowserBase.cs
2007-05-31 15:46:35 UTC (rev 78341)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/WebBrowserBase.cs
2007-05-31 16:00:31 UTC (rev 78342)
@@ -107,7 +107,7 @@
[Browsable (false)]
[DesignerSerializationVisibility
(DesignerSerializationVisibility.Hidden)]
[EditorBrowsable (EditorBrowsableState.Never)]
- public ImeMode ImeMode {
+ public new ImeMode ImeMode {
get { return base.ImeMode; }
set { base.ImeMode = value; }
}
@@ -133,7 +133,7 @@
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
- public bool UseWaitCursor {
+ public new bool UseWaitCursor {
get { return false; }
set { throw new NotSupportedException (); }
}
@@ -147,7 +147,7 @@
#endregion
#region Public Methods
- public void DrawToBitmap (Bitmap bitmap, Rectangle
targetBounds)
+ public new void DrawToBitmap (Bitmap bitmap, Rectangle
targetBounds)
{
throw new NotImplementedException ();
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
