Author: toshok
Date: 2006-12-24 15:56:10 -0500 (Sun, 24 Dec 2006)
New Revision: 70032
Modified:
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/DataGridView.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DateTimePicker.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/GridTablesFactory.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextBoxBase.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStrip.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripContainer.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripContentPanel.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDown.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripPanel.cs
Log:
* GridTablesFactory.cs: 2.0 corcompare work.
* ToolStripContainer.cs: add "override" to
ContextMenuStripChanged, and remove the local event object.
* ToolStripDropDown.cs: same with a couple properties.
* ToolStripPanel.cs: same with AutoSizeChanged event.
* TextBoxBase.cs: add "override" to AutoSizeChanged.
* Form.cs: add the remaining 2.0 events, and do some corcompare
attribute work.
* DateTimePicker.cs: add "new" to padding.
* ButtonBase.cs: use Control's use_compatible_text_rendering.
* ToolStripContentPanel.cs: use base.AutoSizeChanged.
* DataGridView.cs: PaddingChanged is overridden.
2006-12-24 Chris Toshok <[EMAIL PROTECTED]>
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ButtonBase.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ButtonBase.cs
2006-12-24 20:33:27 UTC (rev 70031)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ButtonBase.cs
2006-12-24 20:56:10 UTC (rev 70032)
@@ -46,7 +46,6 @@
internal StringFormat text_format;
internal bool paint_as_acceptbutton;
#if NET_2_0
- private bool use_compatible_text_rendering;
private bool use_visual_style_back_color;
private FlatButtonAppearance flat_button_appearance;
#endif
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2006-12-24 20:33:27 UTC (rev 70031)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2006-12-24 20:56:10 UTC (rev 70032)
@@ -1,5 +1,29 @@
2006-12-24 Chris Toshok <[EMAIL PROTECTED]>
+ * GridTablesFactory.cs: 2.0 corcompare work.
+
+ * ToolStripContainer.cs: add "override" to
+ ContextMenuStripChanged, and remove the local event object.
+
+ * ToolStripDropDown.cs: same with a couple properties.
+
+ * ToolStripPanel.cs: same with AutoSizeChanged event.
+
+ * TextBoxBase.cs: add "override" to AutoSizeChanged.
+
+ * Form.cs: add the remaining 2.0 events, and do some corcompare
+ attribute work.
+
+ * DateTimePicker.cs: add "new" to padding.
+
+ * ButtonBase.cs: use Control's use_compatible_text_rendering.
+
+ * ToolStripContentPanel.cs: use base.AutoSizeChanged.
+
+ * DataGridView.cs: PaddingChanged is overridden.
+
+2006-12-24 Chris Toshok <[EMAIL PROTECTED]>
+
* Control.cs: corecompare work here too.
* DataGridViewElement.cs, DataGridView.cs,
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridView.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridView.cs
2006-12-24 20:33:27 UTC (rev 70031)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridView.cs
2006-12-24 20:56:10 UTC (rev 70032)
@@ -1650,9 +1650,9 @@
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
[DesignerSerializationVisibility
(DesignerSerializationVisibility.Hidden)]
- public event EventHandler PaddingChanged {
- add { Events.AddHandler (PaddingChangedEvent, value); }
- remove { Events.RemoveHandler (PaddingChangedEvent,
value); }
+ public override event EventHandler PaddingChanged {
+ add { base.PaddingChanged += value; }
+ remove { base.PaddingChanged -= value; }
}
public event EventHandler GridColorChanged {
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DateTimePicker.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DateTimePicker.cs
2006-12-24 20:33:27 UTC (rev 70031)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DateTimePicker.cs
2006-12-24 20:56:10 UTC (rev 70032)
@@ -458,13 +458,9 @@
[EditorBrowsable (EditorBrowsableState.Never)]
[DesignerSerializationVisibility
(DesignerSerializationVisibility.Hidden)]
[Browsable (false)]
- public Padding Padding {
- get {
- return base.Padding;
- }
- set {
- base.Padding = value;
- }
+ public new Padding Padding {
+ get { return base.Padding; }
+ set { base.Padding = value; }
}
#endif
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
2006-12-24 20:33:27 UTC (rev 70031)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
2006-12-24 20:56:10 UTC (rev 70032)
@@ -39,6 +39,11 @@
[DesignTimeVisible(false)]
[Designer("System.Windows.Forms.Design.FormDocumentDesigner, " +
Consts.AssemblySystem_Design, typeof(IRootDesigner))]
[DefaultEvent("Load")]
+#if NET_2_0
+ [ClassInterface (ClassInterfaceType.AutoDispatch)]
+ [InitializationEvent ("Load")]
+ [ComVisible (true)]
+#endif
[ToolboxItem(false)]
public class Form : ContainerControl {
#region Local Variables
@@ -258,6 +263,10 @@
}
#if NET_2_0
+ [Browsable (false)]
+ [EditorBrowsable (EditorBrowsableState.Never)]
+ [DesignerSerializationVisibility
(DesignerSerializationVisibility.Hidden)]
+ [Obsolete ("This property has been deprecated in favor of
AutoScaleMode.")]
#else
[DefaultValue(true)]
#endif
@@ -272,9 +281,14 @@
}
}
+#if NET_2_0
+ [DesignerSerializationVisibility
(DesignerSerializationVisibility.Hidden)]
+ [EditorBrowsable(EditorBrowsableState.Never)]
+#else
+ [EditorBrowsable(EditorBrowsableState.Advanced)]
+#endif
[Localizable(true)]
[Browsable(false)]
- [EditorBrowsable(EditorBrowsableState.Advanced)]
public virtual Size AutoScaleBaseSize {
get {
return autoscale_base_size;
@@ -503,6 +517,8 @@
}
#if NET_2_0
+ [DefaultValue (null)]
+ [TypeConverter (typeof (ReferenceConverter))]
public MenuStrip MainMenuStrip {
get { return this.main_menu_strip; }
set { this.main_menu_strip = value; }
@@ -616,6 +632,10 @@
get { return window_manager; }
}
+#if NET_2_0
+ [Browsable (false)]
+ [TypeConverter (typeof (ReferenceConverter))]
+#endif
[DefaultValue(null)]
[MWFCategory("Window Style")]
public MainMenu Menu {
@@ -1150,7 +1170,12 @@
#endregion // Protected Instance Properties
#region Public Static Methods
+#if NET_2_0
+ [EditorBrowsable(EditorBrowsableState.Never)]
+ [Obsolete ("This method has been deprecated. Use
AutoScaleDimensions instead")]
+#else
[EditorBrowsable(EditorBrowsableState.Advanced)]
+#endif
public static SizeF GetAutoScaleSize (Font font)
{
return XplatUI.GetAutoScaleSize(font);
@@ -1327,7 +1352,12 @@
base.AdjustFormScrollbars (displayScrollbars);
}
+#if NET_2_0
+ [EditorBrowsable(EditorBrowsableState.Never)]
+ [Obsolete ("This method has been deprecated")] // XXX what to
use instead?
+#else
[EditorBrowsable(EditorBrowsableState.Advanced)]
+#endif
protected void ApplyAutoScaling()
{
SizeF current_size_f = GetAutoScaleSize (DeviceContext,
Font);
@@ -1713,7 +1743,11 @@
return SelectNextControl(ActiveControl, forward, true,
true, true);
}
+#if NET_2_0
+ [EditorBrowsable(EditorBrowsableState.Never)]
+#else
[EditorBrowsable(EditorBrowsableState.Advanced)]
+#endif
protected override void ScaleCore(float dx, float dy) {
try {
SuspendLayout();
@@ -2157,11 +2191,19 @@
remove { Events.RemoveHandler (ActivatedEvent, value); }
}
+#if NET_2_0
+ [Browsable (false)]
+ [EditorBrowsable (EditorBrowsableState.Never)]
+#endif
public event EventHandler Closed {
add { Events.AddHandler (ClosedEvent, value); }
remove { Events.RemoveHandler (ClosedEvent, value); }
}
+#if NET_2_0
+ [Browsable (false)]
+ [EditorBrowsable (EditorBrowsableState.Never)]
+#endif
public event CancelEventHandler Closing {
add { Events.AddHandler (ClosingEvent, value); }
remove { Events.RemoveHandler (ClosingEvent, value); }
@@ -2202,11 +2244,17 @@
remove { Events.RemoveHandler (MdiChildActivateEvent,
value); }
}
+#if NET_2_0
+ [Browsable (false)]
+#endif
public event EventHandler MenuComplete {
add { Events.AddHandler (MenuCompleteEvent, value); }
remove { Events.RemoveHandler (MenuCompleteEvent,
value); }
}
+#if NET_2_0
+ [Browsable (false)]
+#endif
public event EventHandler MenuStart {
add { Events.AddHandler (MenuStartEvent, value); }
remove { Events.RemoveHandler (MenuStartEvent, value); }
@@ -2227,6 +2275,7 @@
#endregion // Events
#if NET_2_0
+ [SettingsBindable (true)]
public override string Text {
get {
return base.Text;
@@ -2237,6 +2286,7 @@
}
}
+ [SettingsBindable (true)]
public new Point Location {
get {
return base.Location;
@@ -2247,11 +2297,29 @@
}
}
+ static object AutoValidateChangedEvent = new object ();
static object FormClosingEvent = new object ();
static object FormClosedEvent = new object ();
+ static object HelpButtonClickedEvent = new object ();
static object ResizeEndEvent = new object ();
static object ResizeBeginEvent = new object ();
-
+ static object RightToLeftLayoutChangedEvent = new object ();
+ static object ShownEvent = new object ();
+
+ [Browsable (true)]
+ [EditorBrowsable (EditorBrowsableState.Always)]
+ public override event EventHandler AutoSizeChanged {
+ add { base.AutoSizeChanged += value; }
+ remove { base.AutoSizeChanged -= value; }
+ }
+
+ [Browsable (true)]
+ [EditorBrowsable (EditorBrowsableState.Always)]
+ public event EventHandler AutoValidateChanged {
+ add { Events.AddHandler (AutoValidateChangedEvent,
value); }
+ remove { Events.RemoveHandler
(AutoValidateChangedEvent, value); }
+ }
+
public event FormClosingEventHandler FormClosing {
add { Events.AddHandler (FormClosingEvent, value); }
remove { Events.RemoveHandler (FormClosingEvent,
value); }
@@ -2261,7 +2329,49 @@
add { Events.AddHandler (FormClosedEvent, value); }
remove { Events.RemoveHandler (FormClosedEvent, value);
}
}
-
+
+ [Browsable (true)]
+ [EditorBrowsable (EditorBrowsableState.Always)]
+ public event CancelEventHandler HelpButtonClicked {
+ add { Events.AddHandler (HelpButtonClickedEvent,
value); }
+ remove { Events.RemoveHandler (HelpButtonClickedEvent,
value); }
+ }
+
+ [Browsable (false)]
+ [EditorBrowsable (EditorBrowsableState.Never)]
+ public override event EventHandler MarginChanged {
+ add { base.MarginChanged += value; }
+ remove { base.MarginChanged -= value; }
+ }
+
+ public event EventHandler RightToLeftLayoutChanged {
+ add { Events.AddHandler (RightToLeftLayoutChangedEvent,
value); }
+ remove { Events.RemoveHandler
(RightToLeftLayoutChangedEvent, value); }
+ }
+
+ public event EventHandler ResizeBegin {
+ add { Events.AddHandler (ResizeBeginEvent, value); }
+ remove { Events.RemoveHandler (ResizeBeginEvent,
value); }
+ }
+
+ public event EventHandler ResizeEnd {
+ add { Events.AddHandler (ResizeEndEvent, value); }
+ remove { Events.RemoveHandler (ResizeEndEvent, value); }
+ }
+
+ public event EventHandler Shown {
+ add { Events.AddHandler (ShownEvent, value); }
+ remove { Events.RemoveHandler (ShownEvent, value); }
+ }
+
+ [Browsable (false)]
+ [EditorBrowsable (EditorBrowsableState.Never)]
+ public override event EventHandler TabStopChanged {
+ add { base.TabStopChanged += value; }
+ remove { base.TabStopChanged -= value; }
+ }
+
+ [EditorBrowsable (EditorBrowsableState.Advanced)]
protected virtual void OnFormClosing (FormClosingEventArgs e)
{
FormClosingEventHandler eh =
(FormClosingEventHandler)(Events [FormClosingEvent]);
@@ -2269,10 +2379,7 @@
eh (this, e);
}
- public event EventHandler ResizeBegin {
- add { Events.AddHandler (ResizeBeginEvent, value); }
- remove { Events.RemoveHandler (ResizeBeginEvent,
value); }
- }
+ [EditorBrowsable (EditorBrowsableState.Advanced)]
protected virtual void OnResizeBegin (EventArgs e)
{
EventHandler eh = (EventHandler) (Events
[ResizeBeginEvent]);
@@ -2280,11 +2387,7 @@
eh (this, e);
}
- public event EventHandler ResizeEnd {
- add { Events.AddHandler (ResizeEndEvent, value); }
- remove { Events.RemoveHandler (ResizeEndEvent, value); }
- }
-
+ [EditorBrowsable (EditorBrowsableState.Advanced)]
protected virtual void OnResizeEnd (EventArgs e)
{
EventHandler eh = (EventHandler) (Events
[ResizeEndEvent]);
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/GridTablesFactory.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/GridTablesFactory.cs
2006-12-24 20:33:27 UTC (rev 70031)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/GridTablesFactory.cs
2006-12-24 20:56:10 UTC (rev 70032)
@@ -32,20 +32,20 @@
namespace System.Windows.Forms
{
+#if NET_2_0
+ sealed
+#endif
public class GridTablesFactory
{
-
#region Constructors
internal GridTablesFactory ()
{
-
}
#endregion
#region Public Instance Properties
- [MonoTODO]
- public static DataGridTableStyle[] CreateGridTables
(DataGridTableStyle gridTable, object dataSource, string dataMember,
BindingContext bindingManager)
+ public static DataGridTableStyle[] CreateGridTables
(DataGridTableStyle gridTable, object dataSource, string dataMember,
BindingContext bindingManager)
{
throw new NotImplementedException ();
}
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextBoxBase.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextBoxBase.cs
2006-12-24 20:33:27 UTC (rev 70031)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextBoxBase.cs
2006-12-24 20:56:10 UTC (rev 70032)
@@ -1304,7 +1304,7 @@
remove { Events.RemoveHandler (AcceptsTabChangedEvent,
value); }
}
- public event EventHandler AutoSizeChanged {
+ public override event EventHandler AutoSizeChanged {
add { Events.AddHandler (AutoSizeChangedEvent, value); }
remove { Events.RemoveHandler (AutoSizeChangedEvent,
value); }
}
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStrip.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStrip.cs
2006-12-24 20:33:27 UTC (rev 70031)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStrip.cs
2006-12-24 20:56:10 UTC (rev 70032)
@@ -734,7 +734,6 @@
#endregion
#region Public Events
- static object AutoSizeChangedEvent = new object ();
static object ItemAddedEvent = new object ();
static object ItemClickedEvent = new object ();
static object ItemRemovedEvent = new object ();
@@ -745,9 +744,9 @@
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
- public event EventHandler AutoSizeChanged {
- add { Events.AddHandler (AutoSizeChangedEvent, value); }
- remove { Events.RemoveHandler (AutoSizeChangedEvent,
value); }
+ public override event EventHandler AutoSizeChanged {
+ add { base.AutoSizeChanged += value; }
+ remove { base.AutoSizeChanged -= value; }
}
public new event EventHandler CausesValidationChanged {
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripContainer.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripContainer.cs
2006-12-24 20:33:27 UTC (rev 70031)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripContainer.cs
2006-12-24 20:56:10 UTC (rev 70032)
@@ -196,8 +196,6 @@
#endregion
#region Public Events
- static object ContextMenuStripChangedEvent = new object ();
-
[Browsable (false)]
public new event EventHandler BackColorChanged {
add { base.BackColorChanged += value; }
@@ -223,9 +221,9 @@
}
[Browsable (false)]
- public event EventHandler ContextMenuStripChanged {
- add { Events.AddHandler (ContextMenuStripChangedEvent,
value); }
- remove { Events.RemoveHandler
(ContextMenuStripChangedEvent, value); }
+ public override event EventHandler ContextMenuStripChanged {
+ add { base.ContextMenuStripChanged += value; }
+ remove { base.ContextMenuStripChanged -= value; }
}
[Browsable (false)]
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripContentPanel.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripContentPanel.cs
2006-12-24 20:33:27 UTC (rev 70031)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripContentPanel.cs
2006-12-24 20:56:10 UTC (rev 70032)
@@ -195,14 +195,13 @@
#endregion
#region Public Events
- static object AutoSizeChangedEvent = new object ();
static object LoadEvent = new object ();
static object RendererChangedEvent = new object ();
[Browsable (false)]
- public event EventHandler AutoSizeChanged {
- add { Events.AddHandler (AutoSizeChangedEvent, value); }
- remove { Events.RemoveHandler (AutoSizeChangedEvent,
value); }
+ public override event EventHandler AutoSizeChanged {
+ add { base.AutoSizeChanged += value; }
+ remove { base.AutoSizeChanged -= value; }
}
[Browsable (false)]
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:33:27 UTC (rev 70031)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDown.cs
2006-12-24 20:56:10 UTC (rev 70032)
@@ -496,10 +496,8 @@
#region Public Events
static object ClosedEvent = new object ();
static object ClosingEvent = new object ();
- static object ContextMenuStripChangedEvent = new object ();
static object OpenedEvent = new object ();
static object OpeningEvent = new object ();
- static object RegionChangedEvent = new object ();
static object ScrollEvent = new object ();
public new event EventHandler BackgroundImageChanged {
@@ -540,9 +538,9 @@
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
- public event EventHandler ContextMenuStripChanged {
- add { Events.AddHandler (ContextMenuStripChangedEvent,
value); }
- remove { Events.RemoveHandler
(ContextMenuStripChangedEvent, value); }
+ public override event EventHandler ContextMenuStripChanged {
+ add { base.ContextMenuStripChanged += value; }
+ remove { base.ContextMenuStripChanged -= value; }
}
[Browsable (false)]
@@ -614,9 +612,9 @@
remove { Events.RemoveHandler (OpeningEvent, value); }
}
- public event EventHandler RegionChanged {
- add { Events.AddHandler (RegionChangedEvent, value); }
- remove { Events.RemoveHandler (RegionChangedEvent,
value); }
+ public override event EventHandler RegionChanged {
+ add { base.RegionChanged += value; }
+ remove { base.RegionChanged -= value; }
}
[Browsable (false)]
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:33:27 UTC (rev 70031)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripPanel.cs
2006-12-24 20:56:10 UTC (rev 70032)
@@ -275,12 +275,11 @@
#endregion
#region Public Events
- static object AutoSizeChangedEvent = new object ();
static object RendererChangedEvent = new object ();
- public event EventHandler AutoSizeChanged {
- add { Events.AddHandler (AutoSizeChangedEvent, value); }
- remove { Events.RemoveHandler (AutoSizeChangedEvent,
value); }
+ public override event EventHandler AutoSizeChanged {
+ add { base.AutoSizeChanged += value; }
+ remove { base.AutoSizeChanged -= value; }
}
public event EventHandler RendererChanged {
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
