Warnings cleanup
authorMarek Safar <marek.safar@gmail.com>
Fri, 29 Aug 2008 09:46:50 +0000 (09:46 -0000)
committerMarek Safar <marek.safar@gmail.com>
Fri, 29 Aug 2008 09:46:50 +0000 (09:46 -0000)
svn path=/trunk/mcs/; revision=111903

13 files changed:
mcs/class/Managed.Windows.Forms/System.Resources/ResXResourceWriter.cs
mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridBoolColumn.cs
mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridView.cs
mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewCheckBoxCell.cs
mcs/class/Managed.Windows.Forms/System.Windows.Forms/HtmlWindow.cs
mcs/class/Managed.Windows.Forms/System.Windows.Forms/LinkLabel.cs
mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListView.cs
mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListViewItem.cs
mcs/class/Managed.Windows.Forms/System.Windows.Forms/OSFeature.cs
mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolTip.cs
mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUICarbon.cs
mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIX11.cs

index 673aaf691f08144725abf1dd264eb7095f9a5620..5c274abb1ef1c2dde9ff107cada5ce7fea8b7b8b 100644 (file)
@@ -49,7 +49,9 @@ namespace System.Resources
                private TextWriter      textwriter;
                private XmlTextWriter   writer;
                private bool            written;
+#if NET_2_0            
                private string          base_path;
+#endif         
                #endregion      // Local Variables
 
                #region Static Fields
index 4e5967f0e4c775e3a4ef6dc8ed95f06f7f91933b..d8b9eb16fd7dd2caba87a63dc24ae810dbec7fcc 100644 (file)
@@ -5772,12 +5772,12 @@ namespace System.Windows.Forms
                                
                                        // Make sure all our children are properly parented to us
                                        Control [] controls = child_controls.GetAllControls ();
-                                       bool parented = false;
+//                                     bool parented = false;
                                        for (int i=0; i<controls.Length; i++) {
                                                if (controls [i].is_visible && controls[i].IsHandleCreated)
                                                        if (XplatUI.GetParent (controls[i].Handle) != window.Handle) {
                                                                XplatUI.SetParent(controls[i].Handle, window.Handle);
-                                                               parented = true;
+//                                                             parented = true;
                                                        }
 
                                        }
index 08d316b3e0c770d7c3363f97a86580f361c568b4..1a6e827aad29cd9d5ab4896f66ce66c8bf3645b8 100644 (file)
@@ -180,7 +180,6 @@ namespace System.Windows.Forms
 #if NET_2_0
                protected internal override void Edit (CurrencyManager source, int rowNum, Rectangle bounds, bool readOnly, string displayText,  bool cellIsVisible)
                {
-                       string instantText = displayText;
 #else
                protected internal override void Edit (CurrencyManager source, int rowNum, Rectangle bounds, bool readOnly, string instantText, bool cellIsVisible)
                {
index 3da3a8504d5e5262b4f46d6c48a8610a0071886e..675575fb677f9663a756af1aabf345e330242c3e 100644 (file)
@@ -4295,7 +4295,7 @@ namespace System.Windows.Forms {
                        
                        int rows_displayed = 0;
                        int first_row_height = Rows.Count > 0 ? Rows[Math.Min (Rows.Count - 1, first_row_index)].Height : 0;
-                       int room_left = this.Height;
+//                     int room_left = this.Height;
                        
                        // Reset all columns to !Displayed
                        for (int i = 0; i < Columns.Count; i++)
index 329064ee6f914bf1ad1e44bbfa3e8285d66453c1..7139e9d663e2568e20190202a3296280604cdce9 100644 (file)
@@ -42,7 +42,7 @@ namespace System.Windows.Forms {
                private object indeterminateValue;
                private bool threeState;
                private object trueValue;
-               private Type valueType;
+//             private Type valueType;
                private PushButtonState check_state;
 
                public DataGridViewCheckBoxCell ()
index e124df1ed243378be4a57ea5b26286559d1f18c9..95ebfb255c5042613b74056cfbd8e110d074ac68 100644 (file)
@@ -140,7 +140,7 @@ namespace System.Windows.Forms
                public string Prompt (string message, string defaultInputValue)
                {
                        WebBrowserDialogs.Prompt prompt = new WebBrowserDialogs.Prompt ("Prompt", message, defaultInputValue);
-                       DialogResult ret = prompt.Show ();
+                       prompt.Show ();
                        return prompt.Text;
                }
                
index 62575d371192b618ff650505bb60fe54b5d031a9..0f170d29220ee4b8fc50932dc2411a8ccc909637 100644 (file)
@@ -920,7 +920,9 @@ namespace System.Windows.Forms
                public class LinkCollection :  IList, ICollection, IEnumerable
                {
                        private LinkLabel owner;
-                       private bool links_added = false;
+#if NET_2_0                    
+                       private bool links_added;
+#endif                 
 
                        public LinkCollection (LinkLabel owner)
                        {
@@ -982,7 +984,9 @@ namespace System.Windows.Forms
                                }
 
                                int idx = owner.links.Add (value);
+#if NET_2_0                            
                                links_added = true;
+#endif                         
 
                                owner.sorted_links = null;
                                owner.CheckLinks ();
index 1bec32079ed1168f385319bd29e87f473a73414e..1f510f54eceb10b39c32849d4facc22aaa7d91c4 100644 (file)
@@ -1846,7 +1846,9 @@ namespace System.Windows.Forms
                                        ListViewItem item = items [i];
                                        item.Layout ();
                                        item.DisplayIndex = display_index;
+#if NET_2_0                                    
                                        item.SetPosition (new Point (x, y));
+#endif                                 
                                }
 
 
@@ -1977,7 +1979,9 @@ namespace System.Windows.Forms
                                {
                                        display_index = i;
                                        SetItemLocation (i, 0, y, 0, 0);
+#if NET_2_0                                    
                                        item.SetPosition (new Point (0, y));
+#endif                                 
                                        y += item_height;
                                }
 #if NET_2_0
index a224cb70712e2cdbf1b28530c21ead8b082de383..a54c3ee7d3186386176dbe31ad2596c7b8bd6688 100644 (file)
@@ -52,8 +52,8 @@ namespace System.Windows.Forms
                private string image_key = String.Empty;
                string tooltip_text = String.Empty;
                int indent_count;
+               Point position = new Point (-1, -1);            // cached to mimic .Net behaviour       
 #endif
-               Point position = new Point (-1, -1);            // cached to mimic .Net behaviour
                Rectangle bounds = Rectangle.Empty;
                Rectangle checkbox_rect;        // calculated by CalcListViewItem method
                Rectangle icon_rect;
@@ -893,11 +893,11 @@ namespace System.Windows.Forms
                        this.group = group;
                }
 
-#endif
                internal void SetPosition (Point position)
                {
                        this.position = position;
                }
+#endif 
 
                // When focus changed, we need to invalidate area
                // with previous layout and with the new one
index 2e89f9bf0abf1b6744b2fcf67b8caed6376a89b3..4899445a75b79547753a5223f361c0b76a2b2722 100644 (file)
@@ -53,7 +53,9 @@ namespace System.Windows.Forms {
 #if NET_2_0
                public static bool IsPresent (SystemParameter enumVal)
                {
+#pragma warning disable 219                    
                        object o;
+#pragma warning restore 219                    
 
                        switch (enumVal) {
                                case SystemParameter.DropShadow:
index 95be40df466be255396c22ba6c499a4df53d9b89..7c839586d0a2761e7b1cbb94e5649cf3cc15dcde 100644 (file)
@@ -872,6 +872,7 @@ namespace System.Windows.Forms {
                }
 
 #if NET_2_0
+/*
                private void Hide (Control sender)
                {
                        timer.Stop();
@@ -884,6 +885,7 @@ namespace System.Windows.Forms {
                        if (last_control == sender)
                                last_control = null;
                }
+*/
 #endif
 
                private void control_MouseMove(object sender, MouseEventArgs e) {
index 259b4ce113d80ad384404fbbd6844e62ad03394c..e8521587784058b129da2aaf23eb9add2ca51775 100644 (file)
@@ -1592,7 +1592,6 @@ namespace System.Windows.Forms {
                                        return true;
                                }
                        }
-                       return false;
                }
 
                internal override bool PostMessage (IntPtr hwnd, Msg message, IntPtr wParam, IntPtr lParam) {
index 7857fa9705f30d7f409a872b4b22ee4a78a4b054..d1fb0d51be4c82a041b5b4f24bbf091d799363e6 100644 (file)
@@ -3973,8 +3973,6 @@ namespace System.Windows.Forms {
                                        } else {
                                                HitTest ht;
                                                IntPtr dummy;
-                                               int screen_x;
-                                               int screen_y;
 
                                                #if DriverDebugExtra
                                                        Console.WriteLine("GetMessage(): non-client area {0:X} MotionNotify x={1} y={2}", client ? hwnd.client_window.ToInt32() : hwnd.whole_window.ToInt32(), xevent.MotionEvent.x, xevent.MotionEvent.y);