2006-03-29 Mike Kestner <mkestner@novell.com>
authorMike Kestner <mkestner@gmail.com>
Wed, 29 Mar 2006 17:07:10 +0000 (17:07 -0000)
committerMike Kestner <mkestner@gmail.com>
Wed, 29 Mar 2006 17:07:10 +0000 (17:07 -0000)
* *.cs: fix remaining corcompare issues for 1.1 API with the exception
of PrintPreviewDialog and RichTextBox.

svn path=/trunk/mcs/; revision=58743

14 files changed:
mcs/class/Managed.Windows.Forms/System.Resources/ChangeLog
mcs/class/Managed.Windows.Forms/System.Resources/ResXResourceWriter.cs
mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
mcs/class/Managed.Windows.Forms/System.Windows.Forms/CheckedListBox.cs
mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGrid.cs
mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridTableStyle.cs
mcs/class/Managed.Windows.Forms/System.Windows.Forms/FontDialog.cs
mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListBox.cs
mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListView.cs
mcs/class/Managed.Windows.Forms/System.Windows.Forms/PageSetupDialog.cs
mcs/class/Managed.Windows.Forms/System.Windows.Forms/PrintControllerWithStatusDialog.cs
mcs/class/Managed.Windows.Forms/System.Windows.Forms/PrintPreviewControl.cs

index 85dabec3c7a722c2f2ee495a07cc09d8ff97dc86..40a57d8fcb5c91c75f7025a4302e5eb2ceb4c423 100644 (file)
@@ -1,3 +1,7 @@
+2006-03-29  Mike Kestner  <mkestner@novell.com>
+
+       * ResXResourceWriter.cs: Make Dispose() virtual.
+
 2006-01-14  Robert Jordan  <robertj@gmx.net>
 
        * ResXResourceReader.cs: Fix for bug #77253. Thanks to Marek Habersack
index 76da29c1cefc6c19741628255c98267e17538f6c..df16f5d59a886873e73379c61daea2bc47129729 100644 (file)
@@ -280,7 +280,7 @@ namespace System.Resources
                        }
                }
                
-               public void Dispose ()
+               public virtual void Dispose ()
                {
                        Dispose(true);
                        GC.SuppressFinalize(this);
index 71509365ec2665c871210ca66ae1edc0d284b55a..0dd93e41f8b3c5242c0669ba771c4a535b0ccf8b 100644 (file)
@@ -1,3 +1,8 @@
+2006-03-29  Mike Kestner  <mkestner@novell.com>
+
+       * *.cs: fix remaining corcompare issues for 1.1 API with the exception
+       of PrintPreviewDialog and RichTextBox.
+
 2006-03-29  Alexander Olk  <alex.olk@googlemail.com>
 
        * Theme.cs: Added a little helper to SystemResPool to get the Dark,
index 290ea5e858c3af0730633365797d5a0cf3a51a5a..595c831199d205915af75e8dd74edc0079e43609 100644 (file)
@@ -578,11 +578,6 @@ namespace System.Windows.Forms
                                get { return true; }
                        }
 
-                       object IList.this[int index] {
-                               get { return object_items[index]; }
-                               set { throw new NotSupportedException (); }
-                       }
-
                        #endregion Public Properties
 
                        #region Public Methods
@@ -606,11 +601,6 @@ namespace System.Windows.Forms
                                throw new NotSupportedException ();
                        }
 
-                       bool IList.Contains (object selectedIndex)
-                       {
-                               throw new NotImplementedException ();
-                       }
-                               
                        void IList.Insert (int index, object value)
                        {
                                throw new NotSupportedException ();
index 697cd1058c99b6b7dacc62a788fc8f4e41080115..29030e57622cae1588281758f3a4e968225adf7d 100644 (file)
@@ -584,12 +584,6 @@ namespace System.Windows.Forms
                                }
                        }
 
-                       bool IList.IsReadOnly {
-                               get {
-                                       return list.IsReadOnly;
-                               }
-                       }
-
                        bool ICollection.IsSynchronized {
                                get {
                                        return list.IsSynchronized;
@@ -648,12 +642,6 @@ namespace System.Windows.Forms
                                list.Remove(value);
                        }
 
-                       void ICollection.CopyTo(Array array, int index) {
-                               if (list.Count>0) {
-                                       list.CopyTo(array, index);
-                               }
-                       }
-
                        Object ICloneable.Clone() {
                                ControlCollection clone = new ControlCollection(this.owner);
                                clone.list=(ArrayList)list.Clone();             // FIXME: Do we need this?
index 019f6ee91ce96655fa3678f86048edf0ade708b1..70a50ff0f549261032083645740b49d03ad2b6f7 100644 (file)
@@ -994,12 +994,12 @@ namespace System.Windows.Forms
                #region Public Instance Methods
 
                [MonoTODO]
-               public virtual bool BeginEdit (DataGridColumnStyle gridColumn, int rowNumber)
+               public bool BeginEdit (DataGridColumnStyle gridColumn, int rowNumber)
                {
                        return false;
                }
 
-               public virtual void BeginInit ()
+               public void BeginInit ()
                {
                        begininit = true;
                }
@@ -1056,7 +1056,7 @@ namespace System.Windows.Forms
                        base.Dispose (disposing);
                }
 
-               public virtual bool EndEdit (DataGridColumnStyle gridColumn, int rowNumber, bool shouldAbort)
+               public bool EndEdit (DataGridColumnStyle gridColumn, int rowNumber, bool shouldAbort)
                {                                               
                        if (is_adding == true) {                                
                                if (shouldAbort) {
@@ -1080,7 +1080,7 @@ namespace System.Windows.Forms
                        return true;
                }
 
-               public virtual void EndInit ()
+               public void EndInit ()
                {
                        begininit = false;
                }
index 0adef2569a5059df4f85a662cd69119bac74fc28..383e472d6a3a8e1b893d107162197d8e05a89a2e 100644 (file)
@@ -569,7 +569,7 @@ namespace System.Windows.Forms
                #region Public Instance Methods
 
                [MonoTODO]
-               public virtual bool BeginEdit (DataGridColumnStyle gridColumn,  int rowNumber)
+               public bool BeginEdit (DataGridColumnStyle gridColumn,  int rowNumber)
                {
                        throw new NotImplementedException ();
                }
@@ -609,7 +609,7 @@ namespace System.Windows.Forms
                }
 
                [MonoTODO]
-               public virtual bool EndEdit ( DataGridColumnStyle gridColumn,  int rowNumber,  bool shouldAbort)
+               public bool EndEdit ( DataGridColumnStyle gridColumn,  int rowNumber,  bool shouldAbort)
                {
                        throw new NotImplementedException ();
                }
index 0562034367b7129e17fd877c0b8e00b1c4439ca6..9c1a6887650e265656d516a43d5f5fe85e58020a 100644 (file)
@@ -595,6 +595,9 @@ namespace System.Windows.Forms
                #endregion      // Public Instance Properties
                
                #region Protected Instance Properties
+               protected int Options {
+                       get { return 0; }
+               }
                #endregion      // Protected Instance Properties
                
                #region Public Instance Methods
@@ -638,6 +641,11 @@ namespace System.Windows.Forms
                #endregion      // Public Instance Methods
                
                #region Protected Instance Methods
+               protected override IntPtr HookProc (IntPtr hWnd, int msg, IntPtr wparam, IntPtr lparam)
+               {
+                       return base.HookProc (hWnd, msg, wparam, lparam);
+               }
+
                [MonoTODO]
                protected override bool RunDialog( IntPtr hwndOwner )
                {
index e53572e54ebc1a7d901ab58cb3b881bb600f8c34..6ea3c2b4f9001c19f9d9c36c9b372b2c15b3aae5 100644 (file)
@@ -572,6 +572,9 @@ namespace System.Windows.Forms {
                        }
                }
 
+               [Browsable(false)]
+               [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+               [EditorBrowsable(EditorBrowsableState.Advanced)]
                public MainMenu MergedMenu {
                        get {
                                if (!IsMdiChild || window_manager == null)
index ec41a52cff2d56872c3111b234210ac22b8bc177..1f3de0f7d7505032bf24f35a73f1ce7b3d84f44f 100644 (file)
@@ -2293,11 +2293,6 @@ namespace System.Windows.Forms
                                get { return true; }
                        }
 
-                       object IList.this[int index] {
-                               get { return object_items[index]; }
-                               set { throw new NotSupportedException (); }
-                       }
-
                        #endregion Public Properties
 
                        #region Public Methods
@@ -2321,11 +2316,6 @@ namespace System.Windows.Forms
                                throw new NotSupportedException ();
                        }
 
-                       bool IList.Contains (object selectedIndex)
-                       {
-                               throw new NotImplementedException ();
-                       }
-                       
                        void IList.Insert (int index, object value)
                        {
                                throw new NotSupportedException ();
index e6286d185a42aa05043ef0b639f18bee2c644a0c..8dca3330c796c6e2b9be973a4ea4a33239a3fbaa 100644 (file)
@@ -2374,7 +2374,7 @@ namespace System.Windows.Forms
                                return list.Contains (item);
                        }
 
-                       void ICollection.CopyTo (Array dest, int index)
+                       public void CopyTo (Array dest, int index)
                        {
                                list.CopyTo (dest, index);
                        }
index cf67ca593aa207502713289ce0dd152df6de0cca..5392693425667d432f8e60876f6bcc611a70fbb2 100755 (executable)
@@ -35,6 +35,7 @@ using System.Reflection;
 
 namespace System.Windows.Forms {
 
+       [DefaultProperty("Document")]
        public sealed class PageSetupDialog : CommonDialog {
                #region Local variables
                private PrintDocument document;
@@ -83,26 +84,31 @@ namespace System.Windows.Forms {
                #endregion // Public Instance Methods
 
                #region Public Instance Properties
+               [DefaultValue(true)]
                public bool AllowMargins {
                        get { return allow_margins; }
                        set { allow_margins = value; }
                }
 
+               [DefaultValue(true)]
                public bool AllowOrientation {
                        get { return allow_orientation; }
                        set { allow_orientation = value; }
                }
 
+               [DefaultValue(true)]
                public bool AllowPaper {
                        get { return allow_paper; }
                        set { allow_paper = value; }
                }
 
+               [DefaultValue(true)]
                public bool AllowPrinter {
                        get { return allow_printer; }
                        set { allow_printer = value; }
                }
 
+               [DefaultValue(null)]
                public PrintDocument Document {
                        get { return document; }
                        set { document = value; }
@@ -113,21 +119,29 @@ namespace System.Windows.Forms {
                        set { min_margins = value; }
                }
 
+               [Browsable(false)]
+               [DefaultValue(null)]
+               [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
                public PageSettings PageSettings {
                        get { return page_settings; }
                        set { page_settings = value; }
                }
 
+               [Browsable(false)]
+               [DefaultValue(null)]
+               [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
                public PrinterSettings PrinterSettings {
                        get { return printer_settings; }
                        set { printer_settings = value; }
                }
 
+               [DefaultValue(false)]
                public bool ShowHelp {
                        get { return show_help; }
                        set { show_help = value; }
                }
 
+               [DefaultValue(true)]
                public bool ShowNetwork {
                        get { return show_network; }
                        set { show_network = value; }
index d67bc5f358d89721e6d1882e266c61b73723edad..05ecd8f11f18c40ac41f0ac44e0c1a128adfca61 100755 (executable)
@@ -85,7 +85,7 @@ namespace System.Windows.Forms
                #endregion      // Protected Instance Methods\r
 \r
                #region Internal Class\r
-               public class PrintingDialog : Form {\r
+               class PrintingDialog : Form {\r
                        private Button buttonCancel;\r
                        private Label label;\r
 \r
index b598daa7b139012815155a4bd4fd79c561438ea6..88e00df0579cbbf4d5bb45976ae4618acb01e4e4 100755 (executable)
@@ -74,7 +74,7 @@ namespace System.Windows.Forms {
                        get { return document; }
                        set { document = value; }
                }
-               [DefaultValue(0)]
+               [DefaultValue(1)]
                public int Rows {
                        get { return rows; }
                        set { rows = value; }
@@ -85,6 +85,10 @@ namespace System.Windows.Forms {
                        set { startPage = value; }
                }
 
+               [Bindable(false)]
+               [Browsable(false)]
+               [EditorBrowsable(EditorBrowsableState.Never)]
+               [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
                public override string Text {\r
                        get {\r
                                return base.Text;\r
@@ -99,7 +103,7 @@ namespace System.Windows.Forms {
                        get { return useAntiAlias; }
                        set { useAntiAlias = value; }
                }
-               [DefaultValue(1.0)]
+
                public double Zoom {
                        get { return zoom; }
                        set { zoom = value; }
@@ -154,6 +158,8 @@ namespace System.Windows.Forms {
 
                public event EventHandler StartPageChanged;
 
+               [Browsable(false)]
+               [EditorBrowsable(EditorBrowsableState.Never)]
                public new event EventHandler TextChanged;
        }
-}
\ No newline at end of file
+}