diff options
7 files changed, 138 insertions, 42 deletions
diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/BindingManagerBase.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/BindingManagerBase.cs index 9d33131bf33..851c182e926 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/BindingManagerBase.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/BindingManagerBase.cs @@ -35,8 +35,9 @@ namespace System.Windows.Forms { private BindingsCollection bindings; private bool pulling_data; -#region Public Constructors - public BindingManagerBase() { + #region Public Constructors + public BindingManagerBase() + { } #endregion // Public Constructors @@ -75,7 +76,14 @@ namespace System.Windows.Forms { public abstract void EndCurrentEdit(); +#if NET_2_0 + public virtual PropertyDescriptorCollection GetItemProperties() + { + throw new NotImplementedException (); + } +#else public abstract PropertyDescriptorCollection GetItemProperties(); +#endif public abstract void RemoveAt(int index); @@ -90,12 +98,14 @@ namespace System.Windows.Forms { #region Protected Instance Methods [MonoTODO] - protected internal virtual PropertyDescriptorCollection GetItemProperties(ArrayList dataSources, ArrayList listAccessors) { + protected internal virtual PropertyDescriptorCollection GetItemProperties(ArrayList dataSources, ArrayList listAccessors) + { throw new NotImplementedException(); } [MonoTODO] - protected virtual PropertyDescriptorCollection GetItemProperties(Type lisType, int offset, ArrayList dataSources, ArrayList listAccessors) { + protected virtual PropertyDescriptorCollection GetItemProperties(Type lisType, int offset, ArrayList dataSources, ArrayList listAccessors) + { throw new NotImplementedException(); } @@ -125,6 +135,23 @@ namespace System.Windows.Forms { binding.PushData (); } + +#if NET_2_0 + protected void OnBindingComplete (BindingCompleteEventArgs e) + { + if (BindingComplete != null) + BindingComplete (this, e); + } + + protected abstract void OnCurrentItemChanged (EventArgs e); + + protected void OnDataError (Exception e) + { + if (DataError != null) + DataError (this, new BindingManagerDataErrorEventArgs (e)); + } +#endif + protected abstract void UpdateIsBinding(); #endregion // Protected Instance Methods @@ -145,6 +172,12 @@ namespace System.Windows.Forms { add { onPositionChangedHandler += value; } remove { onPositionChangedHandler -= value; } } + +#if NET_2_0 + public event BindingCompleteEventHandler BindingComplete; + public event EventHandler CurrentItemChanged; + public event BindingManagerDataErrorEventHandler DataError; +#endif #endregion // Events } } diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog index 92686723459..338178aa217 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog @@ -1,3 +1,15 @@ +2006-12-26 Chris Toshok <toshok@ximian.com> + + * CurrencyManager.cs, PropertyManager.cs, BindingManagerBase.cs: + more corcompare work. + + * DataGridView.cs: fix compiler warning. + + * ColumnHeader.cs: some corcompare work, and also take the + opportunity to make the internal fields private. + + * ListView.cs: fix the fallout from the above field change. + 2006-12-26 Jonathan Pobst <monkey@jpobst.com> * ToolStripButton.cs, ToolStripComboBox.cs, ToolStripControlHost.cs, diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ColumnHeader.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ColumnHeader.cs index e63dbcfca30..c287171ebc8 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ColumnHeader.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ColumnHeader.cs @@ -35,6 +35,9 @@ namespace System.Windows.Forms [DefaultProperty ("Text")] [DesignTimeVisible (false)] [ToolboxItem (false)] +#if NET_2_0 + // XXX [TypeConverter (typeof (ColumnHeaderConverter))] +#endif public class ColumnHeader : Component, ICloneable { #region Instance Variables @@ -50,9 +53,9 @@ namespace System.Windows.Forms #endif // internal variables - internal Rectangle column_rect = Rectangle.Empty; - internal bool pressed = false; - internal ListView owner; + Rectangle column_rect = Rectangle.Empty; + bool pressed = false; + ListView owner; #endregion // Instance Variables #region Internal Constructor @@ -95,39 +98,38 @@ namespace System.Windows.Forms #endregion // Public Constructors #region Private Internal Methods Properties - // Since this class inherits from MarshalByRef, - // we can't do ColumnHeader.column_rect.XXX. Hence, - // we have some of the following properties to work around CS0197. internal bool Pressed { - get { return this.pressed; } + get { return pressed; } + set { pressed = value; } } internal int X { - get { return this.column_rect.X; } - set { this.column_rect.X = value; } + get { return column_rect.X; } + set { column_rect.X = value; } } internal int Y { - get { return this.column_rect.Y; } - set { this.column_rect.Y = value; } + get { return column_rect.Y; } + set { column_rect.Y = value; } } internal int Wd { - get { return this.column_rect.Width; } - set { this.column_rect.Width = value; } + get { return column_rect.Width; } + set { column_rect.Width = value; } } internal int Ht { - get { return this.column_rect.Height; } - set { this.column_rect.Height = value; } + get { return column_rect.Height; } + set { column_rect.Height = value; } } internal Rectangle Rect { - get { return this.column_rect; } + get { return column_rect; } + set { column_rect = value; } } internal StringFormat Format { - get { return this.format; } + get { return format; } } internal void CalcColumnHeader () @@ -144,21 +146,40 @@ namespace System.Windows.Forms format.FormatFlags = StringFormatFlags.NoWrap; if (width >= 0) { - this.column_rect.Width = width; + column_rect.Width = width; if (owner != null) - this.column_rect.Height = owner.Font.Height + 5 ; + column_rect.Height = owner.Font.Height + 5 ; else - this.column_rect.Height = ThemeEngine.Current.DefaultFont.Height + 5; + column_rect.Height = ThemeEngine.Current.DefaultFont.Height + 5; } - else if (this.Index != -1) - this.column_rect.Size = owner.GetChildColumnSize (this.Index); + else if (Index != -1) + column_rect.Size = owner.GetChildColumnSize (Index); else - this.column_rect.Size = Size.Empty; + column_rect.Size = Size.Empty; } + + internal void SetListView (ListView list_view) + { + owner = list_view; + } + #endregion // Private Internal Methods Properties #region Public Instance Properties #if NET_2_0 + [Localizable (true)] + [RefreshProperties (RefreshProperties.Repaint)] + public int DisplayIndex { + get { throw new NotImplementedException (); } + set { throw new NotImplementedException (); } + } + + [DefaultValue (-1)] + [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] + [Editor ("System.Windows.Forms.Design.ImageIndexEditor, " + Consts.AssemblySystem_Design, + "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)] + [RefreshProperties (RefreshProperties.Repaint)] + [TypeConverter (typeof (ImageIndexConverter))] public int ImageIndex { get { return image_index; @@ -172,6 +193,12 @@ namespace System.Windows.Forms } } + [DefaultValue ("")] + [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] + [Editor ("System.Windows.Forms.Design.ImageIndexEditor, " + Consts.AssemblySystem_Design, + "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)] + [RefreshProperties (RefreshProperties.Repaint)] + // XXX [TypeConverter (typeof (ImageKeyConverter))] public string ImageKey { get { return image_key; @@ -182,6 +209,7 @@ namespace System.Windows.Forms } } + [Browsable (false)] public ImageList ImageList { get { if (owner == null) @@ -209,6 +237,7 @@ namespace System.Windows.Forms } #if NET_2_0 + [Browsable (false)] public string Name { get { return name; @@ -218,8 +247,10 @@ namespace System.Windows.Forms } } - [LocalizableAttribute (false)] + [DefaultValue (null)] [BindableAttribute (true)] + [LocalizableAttribute (false)] + [TypeConverter (typeof (StringConverter))] public object Tag { get { return tag; diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/CurrencyManager.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/CurrencyManager.cs index db161937840..1066b7eadf4 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/CurrencyManager.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/CurrencyManager.cs @@ -252,6 +252,12 @@ namespace System.Windows.Forms { } } +#if NET_2_0 + protected override void OnCurrentItemChanged (EventArgs e) + { + } +#endif + protected virtual void OnItemChanged (ItemChangedEventArgs e) { if (ItemChanged != null) @@ -313,7 +319,12 @@ namespace System.Windows.Forms { return TypeDescriptor.GetProperties (t, att); } - private void OnMetaDataChanged (EventArgs args) +#if NET_2_0 + protected +#else + private +#endif + void OnMetaDataChanged (EventArgs args) { if (MetaDataChanged != null) MetaDataChanged (this, args); @@ -358,6 +369,9 @@ namespace System.Windows.Forms { } } +#if NET_2_0 + public event ListChangedEventHandler ListChanged; +#endif public event ItemChangedEventHandler ItemChanged; public event EventHandler MetaDataChanged; } diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridView.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridView.cs index 950697ec598..eb1b1bce06a 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridView.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridView.cs @@ -1188,7 +1188,6 @@ namespace System.Windows.Forms { static object DefaultValuesNeededEvent = new object (); static object EditingControlShowingEvent = new object (); static object EditModeChangedEvent = new object (); - static object PaddingChangedEvent = new object (); static object GridColorChangedEvent = new object (); static object MultiSelectChangedEvent = new object (); static object NewRowNeededEvent = new object (); diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListView.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListView.cs index 9d73afc48fb..b2266f6de26 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListView.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListView.cs @@ -2332,10 +2332,10 @@ namespace System.Windows.Forms if (owner.AllowColumnReorder) { drag_x = me.X; drag_column = (ColumnHeader) (clicked_column as ICloneable).Clone (); - drag_column.column_rect = clicked_column.Rect; + drag_column.Rect = clicked_column.Rect; drag_to_index = GetReorderedIndex (clicked_column); } - clicked_column.pressed = true; + clicked_column.Pressed = true; Rectangle bounds = clicked_column.Rect; bounds.X -= owner.h_marker; Invalidate (bounds); @@ -2374,9 +2374,9 @@ namespace System.Windows.Forms if (owner.AllowColumnReorder) { Rectangle r; - r = drag_column.column_rect; + r = drag_column.Rect; r.X = clicked_column.Rect.X + me.X - drag_x; - drag_column.column_rect = r; + drag_column.Rect = r; int x = me.X + owner.h_marker; ColumnHeader over = ColumnAtX (x); @@ -2389,9 +2389,9 @@ namespace System.Windows.Forms Invalidate (); } else { ColumnHeader over = ColumnAtX (me.X + owner.h_marker); - bool pressed = clicked_column.pressed; - clicked_column.pressed = over == clicked_column; - if (clicked_column.pressed ^ pressed) { + bool pressed = clicked_column.Pressed; + clicked_column.Pressed = over == clicked_column; + if (clicked_column.Pressed ^ pressed) { Rectangle bounds = clicked_column.Rect; bounds.X -= owner.h_marker; Invalidate (bounds); @@ -2429,8 +2429,8 @@ namespace System.Windows.Forms return; } - if (clicked_column != null && clicked_column.pressed) { - clicked_column.pressed = false; + if (clicked_column != null && clicked_column.Pressed) { + clicked_column.Pressed = false; Rectangle bounds = clicked_column.Rect; bounds.X -= owner.h_marker; Invalidate (bounds); @@ -2848,7 +2848,7 @@ namespace System.Windows.Forms public virtual int Add (ColumnHeader value) { int idx; - value.owner = this.owner; + value.SetListView (this.owner); idx = list.Add (value); if (owner.IsHandleCreated) { owner.Redraw (true); @@ -2908,7 +2908,7 @@ namespace System.Windows.Forms public virtual void AddRange (ColumnHeader [] values) { foreach (ColumnHeader colHeader in values) { - colHeader.owner = this.owner; + colHeader.SetListView (this.owner); Add (colHeader); } @@ -3016,7 +3016,7 @@ namespace System.Windows.Forms if (index < 0 || index > list.Count) throw new ArgumentOutOfRangeException ("index"); - value.owner = this.owner; + value.SetListView (owner); list.Insert (index, value); owner.Redraw (true); } diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyManager.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyManager.cs index e0d681a165d..c808593dc00 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyManager.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyManager.cs @@ -155,6 +155,13 @@ namespace System.Windows.Forms { onCurrentChangedHandler (this, e); } } + +#if NET_2_0 + protected override void OnCurrentItemChanged (EventArgs e) + { + throw new NotImplementedException (); + } +#endif } } |