Author: toshok
Date: 2006-12-24 16:35:43 -0500 (Sun, 24 Dec 2006)
New Revision: 70033
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ControlStyles.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGrid.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridTableStyle.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ErrorProvider.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ICurrencyManagerProvider.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Keys.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Splitter.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TableLayoutPanel.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDown.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripManager.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripManagerRenderMode.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripPanel.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripPanelRow.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripRenderMode.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripSplitButton.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripStatusLabelBorderSides.cs
Log:
more corcompare work
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-24 20:56:10 UTC (rev 70032)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
2006-12-24 21:35:43 UTC (rev 70033)
@@ -319,13 +319,19 @@
#endregion
#region ControlCollection Public Instance Properties
- public int Count {
+ public int Count
+ {
get {
return list.Count;
}
}
- public bool IsReadOnly {
+#if NET_2_0
+ bool IList.IsReadOnly
+#else
+ public bool IsReadOnly
+#endif
+ {
get {
return list.IsReadOnly;
}
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ControlStyles.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ControlStyles.cs
2006-12-24 20:56:10 UTC (rev 70032)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ControlStyles.cs
2006-12-24 21:35:43 UTC (rev 70033)
@@ -27,6 +27,8 @@
// COMPLETE
+using System.ComponentModel;
+
namespace System.Windows.Forms {
[Flags]
@@ -45,7 +47,12 @@
AllPaintingInWmPaint = 0x00002000,
CacheText = 0x00004000,
EnableNotifyMessage = 0x00008000,
+
+#if NET_2_0
+ [EditorBrowsable (EditorBrowsableState.Never)]
DoubleBuffer = 0x00010000,
+#endif
+
#if NET_2_0
OptimizedDoubleBuffer = 0x00020000,
UseTextForAccessibility = 0x00040000
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGrid.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGrid.cs
2006-12-24 20:56:10 UTC (rev 70032)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGrid.cs
2006-12-24 21:35:43 UTC (rev 70033)
@@ -117,7 +117,9 @@
public class DataGrid : Control, ISupportInitialize,
IDataGridEditingService
{
[Flags]
+#if !NET_2_0
[Serializable]
+#endif
public enum HitTestType
{
None = 0,
@@ -583,7 +585,9 @@
[DefaultValue(null)]
[RefreshProperties(RefreshProperties.Repaint)]
+#if !NET_2_0
[TypeConverter("System.Windows.Forms.Design.DataSourceConverter, " +
Consts.AssemblySystem_Design)]
+#endif
public object DataSource {
get { return datasource; }
set {
@@ -700,7 +704,9 @@
get { return new Font (Font, FontStyle.Underline); }
}
+#if !NET_2_0
[ComVisible(false)]
+#endif
[Browsable(false)]
[EditorBrowsable(EditorBrowsableState.Never)]
public Color LinkHoverColor {
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridTableStyle.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridTableStyle.cs
2006-12-24 20:56:10 UTC (rev 70032)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridTableStyle.cs
2006-12-24 21:35:43 UTC (rev 70033)
@@ -42,6 +42,9 @@
[ToolboxItem(false)]
public class DataGridTableStyle : Component, IDataGridEditingService
{
+#if NET_2_0
+ readonly
+#endif
public static DataGridTableStyle DefaultTableStyle = new
DataGridTableStyle (true);
#region Local Variables
@@ -306,7 +309,9 @@
}
}
+#if !NET_2_0
[ComVisible(false)]
+#endif
[EditorBrowsable(EditorBrowsableState.Never)]
[Browsable(false)]
public Color LinkHoverColor {
@@ -321,6 +326,9 @@
}
[Editor("System.Windows.Forms.Design.DataGridTableStyleMappingNameEditor, " +
Consts.AssemblySystem_Design, typeof(System.Drawing.Design.UITypeEditor))]
+#if NET_2_0
+ [DefaultValue ("")]
+#endif
public string MappingName {
get { return mapping_name; }
set {
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ErrorProvider.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ErrorProvider.cs
2006-12-24 20:56:10 UTC (rev 70032)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ErrorProvider.cs
2006-12-24 21:35:43 UTC (rev 70033)
@@ -341,7 +341,9 @@
[MonoTODO]
[DefaultValue(null)]
+#if !NET_2_0
[TypeConverter("System.Windows.Forms.Design.DataSourceConverter, " +
Consts.AssemblySystem_Design)]
+#endif
public object DataSource {
get {
return datasource;
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ICurrencyManagerProvider.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ICurrencyManagerProvider.cs
2006-12-24 20:56:10 UTC (rev 70032)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ICurrencyManagerProvider.cs
2006-12-24 21:35:43 UTC (rev 70033)
@@ -24,8 +24,10 @@
namespace System.Windows.Forms {
- interface ICurrencyManagerProvider {
- CurrencyManager CurrencyMnaager { get; }
+ public interface ICurrencyManagerProvider {
+ CurrencyManager CurrencyManager { get; }
+
+ CurrencyManager GetRelatedCurrencyManager (string dataMember);
}
}
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Keys.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Keys.cs
2006-12-24 20:56:10 UTC (rev 70032)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Keys.cs
2006-12-24 21:35:43 UTC (rev 70033)
@@ -33,6 +33,10 @@
[Flags]
[ComVisible(true)]
[TypeConverter(typeof(KeysConverter))]
+#if NET_2_0
+ [Editor ("System.Windows.Forms.Design.ShortcutKeysEditor, " +
Consts.AssemblySystem_Design,
+ "System.Drawing.Design.UITypeEditor, " +
Consts.AssemblySystem_Drawing)]
+#endif
public enum Keys {
None = 0x00000000,
LButton = 0x00000001,
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Splitter.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Splitter.cs
2006-12-24 20:56:10 UTC (rev 70032)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Splitter.cs
2006-12-24 21:35:43 UTC (rev 70033)
@@ -38,7 +38,11 @@
[DefaultEvent("SplitterMoved")]
[Designer("System.Windows.Forms.Design.SplitterDesigner, " +
Consts.AssemblySystem_Design, "System.ComponentModel.Design.IDesigner")]
[DefaultProperty("Dock")]
- public class Splitter : Control, IMessageFilter {
+ public class Splitter : Control
+#if !NET_2_0
+ , IMessageFilter
+#endif
+ {
#region Enums
private enum DrawType {
Initial,
@@ -342,9 +346,11 @@
#endregion // Protected Instance Properties
#region Public Instance Methods
+#if !NET_2_0
public bool PreFilterMessage(ref Message m) {
return false;
}
+#endif
public override string ToString() {
return base.ToString () + String.Format(", MinExtra:
{0}, MinSize: {1}", min_extra, min_size);
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TableLayoutPanel.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TableLayoutPanel.cs
2006-12-24 20:56:10 UTC (rev 70032)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TableLayoutPanel.cs
2006-12-24 21:35:43 UTC (rev 70033)
@@ -41,7 +41,6 @@
[ProvideProperty ("ColumnSpan", typeof (Control))]
[ProvideProperty ("Row", typeof (Control))]
[ProvideProperty ("RowSpan", typeof (Control))]
- [DefaultEvent ("Paint")]
[DefaultProperty ("ColumnCount")]
public class TableLayoutPanel : Panel, IExtenderProvider
{
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDown.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDown.cs
2006-12-24 20:56:10 UTC (rev 70032)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDown.cs
2006-12-24 21:35:43 UTC (rev 70033)
@@ -58,7 +58,6 @@
#region Public Properties
[Browsable (false)]
- [EditorBrowsable (EditorBrowsableState.Never)]
public bool AllowTransparency {
get { return allow_transparency; }
set {
@@ -77,14 +76,12 @@
}
[Browsable (false)]
- [DesignerSerializationVisibility
(DesignerSerializationVisibility.Hidden)]
public override AnchorStyles Anchor {
get { return base.Anchor; }
set { base.Anchor = value; }
}
- [Browsable (false)]
- [EditorBrowsable (EditorBrowsableState.Never)]
+ [DefaultValue (true)]
public bool AutoClose
{
get { return this.auto_close; }
@@ -138,7 +135,6 @@
[EditorBrowsable (EditorBrowsableState.Never)]
public new ToolStripGripDisplayStyle GripDisplayStyle {
get { return ToolStripGripDisplayStyle.Vertical; }
- set { }
}
[Browsable (false)]
@@ -152,7 +148,6 @@
[EditorBrowsable (EditorBrowsableState.Never)]
public new Rectangle GripRectangle {
get { return Rectangle.Empty; }
- set { }
}
[Browsable (false)]
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripManager.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripManager.cs
2006-12-24 20:56:10 UTC (rev 70032)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripManager.cs
2006-12-24 21:35:43 UTC (rev 70033)
@@ -46,6 +46,10 @@
ToolStripManager.render_mode =
ToolStripManagerRenderMode.Professional;
ToolStripManager.visual_styles_enabled =
Application.RenderWithVisualStyles;
}
+
+ private ToolStripManager ()
+ {
+ }
#endregion
#region Public Properties
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripManagerRenderMode.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripManagerRenderMode.cs
2006-12-24 20:56:10 UTC (rev 70032)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripManagerRenderMode.cs
2006-12-24 21:35:43 UTC (rev 70033)
@@ -26,15 +26,18 @@
// Jonathan Pobst ([EMAIL PROTECTED])
//
+#if NET_2_0
+using System.ComponentModel;
-#if NET_2_0
namespace System.Windows.Forms
{
public enum ToolStripManagerRenderMode
{
+ [Browsable (false)]
Custom = 0,
+
System = 1,
Professional = 2
}
}
-#endif
\ No newline at end of file
+#endif
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripPanel.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripPanel.cs
2006-12-24 20:56:10 UTC (rev 70032)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripPanel.cs
2006-12-24 21:35:43 UTC (rev 70033)
@@ -81,7 +81,8 @@
set { base.AutoScrollMinSize = value; }
}
- [Browsable (false)]
+ [DefaultValue (true)]
+ [DesignerSerializationVisibility
(DesignerSerializationVisibility.Visible)]
public override bool AutoSize {
get { return base.AutoSize; }
set { base.AutoSize = value; }
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripPanelRow.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripPanelRow.cs
2006-12-24 20:56:10 UTC (rev 70032)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripPanelRow.cs
2006-12-24 21:35:43 UTC (rev 70033)
@@ -55,7 +55,7 @@
#endregion
#region Public Properties
- public Rectangle Bounds {
+ public virtual Rectangle Bounds {
get { return this.bounds; }
}
@@ -196,4 +196,4 @@
#endregion
}
}
-#endif
\ No newline at end of file
+#endif
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripRenderMode.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripRenderMode.cs
2006-12-24 20:56:10 UTC (rev 70032)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripRenderMode.cs
2006-12-24 21:35:43 UTC (rev 70033)
@@ -28,14 +28,18 @@
#if NET_2_0
+using System.ComponentModel;
+
namespace System.Windows.Forms
{
public enum ToolStripRenderMode
{
+ [Browsable (false)]
Custom = 0,
+
System = 1,
Professional = 2,
ManagerRenderMode = 3
}
}
-#endif
\ No newline at end of file
+#endif
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripSplitButton.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripSplitButton.cs
2006-12-24 20:56:10 UTC (rev 70032)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripSplitButton.cs
2006-12-24 21:35:43 UTC (rev 70033)
@@ -111,7 +111,6 @@
get { return base.Selected; }
}
- [DefaultValue (11)]
public int DropDownButtonWidth {
get { return this.drop_down_button_width; }
set {
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripStatusLabelBorderSides.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripStatusLabelBorderSides.cs
2006-12-24 20:56:10 UTC (rev 70032)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripStatusLabelBorderSides.cs
2006-12-24 21:35:43 UTC (rev 70033)
@@ -29,11 +29,14 @@
#if NET_2_0
using System.Runtime.InteropServices;
+using System.ComponentModel;
namespace System.Windows.Forms
{
[Flags]
[ComVisible(true)]
+ [Editor ("System.Windows.Forms.Design.BorderSidesEditor, " +
Consts.AssemblySystem_Design,
+ "System.Drawing.Design.UITypeEditor, " +
Consts.AssemblySystem_Drawing)]
public enum ToolStripStatusLabelBorderSides
{
None = 0,
@@ -44,4 +47,4 @@
All = 15
}
}
-#endif
\ No newline at end of file
+#endif
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
