Author: rolf
Date: 2007-03-16 15:31:51 -0500 (Fri, 16 Mar 2007)
New Revision: 74488
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/BindingSource.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ButtonBase.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/CheckBox.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridColumnStyle.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/RadioButton.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/SendKeys.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextRenderer.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStrip.cs
Log:
* ButtonBase.cs, ToolStrip.cs, SendKeys.cs, TextRenderer.cs,
CheckBox.cs, RadioButton.cs, BindingSource.cs,
DataGridColumnStyle.cs: Remove warnings.
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/BindingSource.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/BindingSource.cs
2007-03-16 19:59:55 UTC (rev 74487)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/BindingSource.cs
2007-03-16 20:31:51 UTC (rev 74488)
@@ -495,7 +495,7 @@
throw new NotImplementedException ();
}
- protected virtual void Dispose (bool disposing)
+ protected override void Dispose (bool disposing)
{
throw new NotImplementedException ();
}
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ButtonBase.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ButtonBase.cs
2007-03-16 19:59:55 UTC (rev 74487)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ButtonBase.cs
2007-03-16 20:31:51 UTC (rev 74488)
@@ -65,7 +65,7 @@
[ComVisible(true)]
public class ButtonBaseAccessibleObject :
ControlAccessibleObject {
#region ButtonBaseAccessibleObject Local Variables
- private Control owner;
+ private new Control owner;
#endregion // ButtonBaseAccessibleObject Local
Variables
#region ButtonBaseAccessibleObject Constructors
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-03-16 19:59:55 UTC (rev 74487)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-03-16 20:31:51 UTC (rev 74488)
@@ -1,5 +1,11 @@
2007-03-16 Rolf Bjarne Kvinge <[EMAIL PROTECTED]>
+ * ButtonBase.cs, ToolStrip.cs, SendKeys.cs, TextRenderer.cs,
+ CheckBox.cs, RadioButton.cs, BindingSource.cs,
+ DataGridColumnStyle.cs: Remove warnings.
+
+2007-03-16 Rolf Bjarne Kvinge <[EMAIL PROTECTED]>
+
* Menu.cs: MergeMenu: Check menu argument for null before looping over
it.
* MdiWindowManager.cs: Add IsVisiblePending to track the pending
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/CheckBox.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/CheckBox.cs
2007-03-16 19:59:55 UTC (rev 74487)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/CheckBox.cs
2007-03-16 20:31:51 UTC (rev 74488)
@@ -51,7 +51,7 @@
[ComVisible(true)]
public class CheckBoxAccessibleObject :
ButtonBaseAccessibleObject {
#region CheckBoxAccessibleObject Local Variables
- private CheckBox owner;
+ private new CheckBox owner;
#endregion // CheckBoxAccessibleObject Local
Variables
#region CheckBoxAccessibleObject Constructors
@@ -373,7 +373,7 @@
}
#if NET_2_0
- public event MouseEventHandler MouseDoubleClick {
+ public new event MouseEventHandler MouseDoubleClick {
add { base.MouseDoubleClick += value; }
remove { base.MouseDoubleClick -= value; }
}
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridColumnStyle.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridColumnStyle.cs
2007-03-16 19:59:55 UTC (rev 74487)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridColumnStyle.cs
2007-03-16 20:31:51 UTC (rev 74488)
@@ -42,7 +42,7 @@
protected class DataGridColumnHeaderAccessibleObject :
AccessibleObject
{
#region Local Variables
- private DataGridColumnStyle owner;
+ private new DataGridColumnStyle owner;
#endregion
#region Constructors
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/RadioButton.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/RadioButton.cs
2007-03-16 19:59:55 UTC (rev 74487)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/RadioButton.cs
2007-03-16 20:31:51 UTC (rev 74488)
@@ -49,7 +49,7 @@
[ComVisible(true)]
public class RadioButtonAccessibleObject :
ControlAccessibleObject {
#region RadioButtonAccessibleObject Local Variables
- private RadioButton owner;
+ private new RadioButton owner;
#endregion // RadioButtonAccessibleObject Local
Variables
#region RadioButtonAccessibleObject Constructors
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/SendKeys.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/SendKeys.cs
2007-03-16 19:59:55 UTC (rev 74487)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/SendKeys.cs
2007-03-16 20:31:51 UTC (rev 74488)
@@ -156,7 +156,6 @@
private static void Parse(string key_string) {
bool isBlock = false;
bool isVkey = false;
- bool isKey = false;
bool isRepeat = false;
bool isShift = false;
bool isCtrl = false;
@@ -195,9 +194,6 @@
if (start == key_len || start
== i+1)
throw new
ArgumentException("SendKeys string {0} is not valid.", key_string);
- if (group_string.Length == 1) {
- isKey = true;
- }
else if
(SendKeys.keywords.Contains(group_string.ToString().ToUpper())) {
isVkey = true;
}
@@ -223,7 +219,7 @@
}
i = start;
- isRepeat = isKey = isVkey =
false;
+ isRepeat = isVkey = false;
if (isShift)
AddVKey((int)keywords["+"], false);
if (isCtrl)
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextRenderer.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextRenderer.cs
2007-03-16 19:59:55 UTC (rev 74487)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextRenderer.cs
2007-03-16 20:31:51 UTC (rev 74488)
@@ -466,6 +466,7 @@
#endregion
#region DllImports (Windows)
+#if NET_2_0
[DllImport ("user32", CharSet = CharSet.Unicode, EntryPoint =
"DrawText")]
static extern int Win32DrawText (IntPtr hdc, string lpStr, int
nCount, ref XplatUIWin32.RECT lpRect, int wFormat);
@@ -486,6 +487,7 @@
[DllImport("gdi32")]
static extern bool SelectClipRgn(IntPtr hdc, IntPtr hrgn);
+#endif
#endregion
}
}
\ No newline at end of file
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStrip.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStrip.cs
2007-03-16 19:59:55 UTC (rev 74487)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStrip.cs
2007-03-16 20:31:51 UTC (rev 74488)
@@ -433,7 +433,7 @@
#region Public Methods
[Browsable (false)]
- public Control GetChildAtPoint (Point point)
+ public new Control GetChildAtPoint (Point point)
{
return base.GetChildAtPoint (point);
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches