[bcl] Clean up some warnings

8 files changed, 8 insertions, 21 deletions

diff --git a/mcs/class/System.Design/Makefile b/mcs/class/System.Design/Makefile
index 1e9a30c444c..2272546a83c 100644
--- a/mcs/class/System.Design/Makefile
+++ b/mcs/class/System.Design/Makefile
@@ -5,7 +5,7 @@ include ../../build/rules.make
 LIBRARY = System.Design.dll
 
 LIB_REFS = System System.Xml plainweb/System.Web System.Windows.Forms System.Drawing Accessibility System.Data System.Configuration
-LIB_MCS_FLAGS =
+LIB_MCS_FLAGS = -nowarn:436 -nowarn:612,618,649,67,672
 
 TEST_LIB_REFS = System System.Drawing System.Windows.Forms
 TEST_MCS_FLAGS =
diff --git a/mcs/class/System.Design/System.Design.dll.sources b/mcs/class/System.Design/System.Design.dll.sources
index 2fc410bf55c..05a3f9750e2 100755
--- a/mcs/class/System.Design/System.Design.dll.sources
+++ b/mcs/class/System.Design/System.Design.dll.sources
@@ -1,7 +1,4 @@
 Assembly/AssemblyInfo.cs
-../../build/common/Consts.cs
-../../build/common/Locale.cs
-../../build/common/MonoTODOAttribute.cs
 System.ComponentModel.Design/ActiveDesignSurfaceChangedEventArgs.cs
 System.ComponentModel.Design/ActiveDesignSurfaceChangedEventHandler.cs
 System.ComponentModel.Design/ArrayEditor.cs
diff --git a/mcs/class/System.Design/System.Web.UI.Design.WebControls/CompositeControlDesigner.cs b/mcs/class/System.Design/System.Web.UI.Design.WebControls/CompositeControlDesigner.cs
index b4f85d90eb9..17997212533 100644
--- a/mcs/class/System.Design/System.Web.UI.Design.WebControls/CompositeControlDesigner.cs
+++ b/mcs/class/System.Design/System.Web.UI.Design.WebControls/CompositeControlDesigner.cs
@@ -49,7 +49,7 @@ namespace System.Web.UI.Design.WebControls
 			throw new NotImplementedException ();

 		}

 

-		public virtual string GetDesignTimeHtml (DesignerRegionCollection regions) {

+		public override string GetDesignTimeHtml (DesignerRegionCollection regions) {

 			throw new NotImplementedException ();

 		}

 

diff --git a/mcs/class/System.Design/System.Web.UI.Design.WebControls/ListControlDesigner.cs b/mcs/class/System.Design/System.Web.UI.Design.WebControls/ListControlDesigner.cs
index a8bf4e607fd..00a2a297af0 100644
--- a/mcs/class/System.Design/System.Web.UI.Design.WebControls/ListControlDesigner.cs
+++ b/mcs/class/System.Design/System.Web.UI.Design.WebControls/ListControlDesigner.cs
@@ -34,11 +34,9 @@ using System.Windows.Forms.Design;
 
 namespace System.Web.UI.Design.WebControls {
 
-	public class ListControlDesigner :
-	DataBoundControlDesigner
+	public class ListControlDesigner : DataBoundControlDesigner
 	{
 		string data_key_field;
-		string data_member;
 		string data_text_field;
 		string data_value_field;
 		
@@ -55,19 +53,11 @@ namespace System.Web.UI.Design.WebControls {
 			get { throw new NotImplementedException (); }
 		}
 
-		public string DataSource {
-			get; set;
-		}
 		public string DataKeyField {
 			get { return data_key_field; }
 			set { data_key_field = value; }
 		}
 
-		public string DataMember {
-			get { return data_member; }
-			set { data_member = value; }
-		}
-
 		public string DataTextField {
 			get { return data_text_field; }
 			set { data_text_field = value; }
diff --git a/mcs/class/System.Design/System.Web.UI.Design/ConnectionStringEditor.cs b/mcs/class/System.Design/System.Web.UI.Design/ConnectionStringEditor.cs
index fd983f4314c..3cf9aa14c6c 100644
--- a/mcs/class/System.Design/System.Web.UI.Design/ConnectionStringEditor.cs
+++ b/mcs/class/System.Design/System.Web.UI.Design/ConnectionStringEditor.cs
@@ -46,13 +46,13 @@ namespace System.Web.UI.Design
 		}
 
 		[MonoTODO]
-		public virtual object EditValue (ITypeDescriptorContext context, IServiceProvider provider, object value)
+		public override object EditValue (ITypeDescriptorContext context, IServiceProvider provider, object value)
 		{
 			throw new NotImplementedException ();
 		}
 
 		[MonoTODO]
-		public virtual UITypeEditorEditStyle GetEditStyle (ITypeDescriptorContext context)
+		public override UITypeEditorEditStyle GetEditStyle (ITypeDescriptorContext context)
 		{
 			throw new NotImplementedException ();
 		}
diff --git a/mcs/class/System.Design/System.Web.UI.Design/TemplatedControlDesigner.cs b/mcs/class/System.Design/System.Web.UI.Design/TemplatedControlDesigner.cs
index 466ca9a3206..b8f1790ba01 100644
--- a/mcs/class/System.Design/System.Web.UI.Design/TemplatedControlDesigner.cs
+++ b/mcs/class/System.Design/System.Web.UI.Design/TemplatedControlDesigner.cs
@@ -172,7 +172,7 @@ namespace System.Web.UI.Design
 
 
 		[Obsolete ("Use ControlDesigner.InTemplateMode instead")]
-		public bool InTemplateMode {
+		public new bool InTemplateMode {
 			get {
 				return _templateMode;
 			}
diff --git a/mcs/class/System.Design/System.Windows.Forms.Design.Behavior/BehaviorServiceAdornerCollection.cs b/mcs/class/System.Design/System.Windows.Forms.Design.Behavior/BehaviorServiceAdornerCollection.cs
index 0c633bd8dba..1ebedec8f31 100644
--- a/mcs/class/System.Design/System.Windows.Forms.Design.Behavior/BehaviorServiceAdornerCollection.cs
+++ b/mcs/class/System.Design/System.Windows.Forms.Design.Behavior/BehaviorServiceAdornerCollection.cs
@@ -106,7 +106,7 @@ namespace System.Windows.Forms.Design.Behavior
 			return InnerList.IndexOf (value);
 		}
 
-		public BehaviorServiceAdornerCollectionEnumerator GetEnumerator ()
+		public new BehaviorServiceAdornerCollectionEnumerator GetEnumerator ()
 		{
 			return new BehaviorServiceAdornerCollectionEnumerator (this);
 		}
diff --git a/mcs/class/System.Design/System.Windows.Forms.Design/AxParameterData.cs b/mcs/class/System.Design/System.Windows.Forms.Design/AxParameterData.cs
index 9ea317b1bdb..99e1f6abe10 100644
--- a/mcs/class/System.Design/System.Windows.Forms.Design/AxParameterData.cs
+++ b/mcs/class/System.Design/System.Windows.Forms.Design/AxParameterData.cs
@@ -134,6 +134,6 @@ namespace System.Windows.Forms.Design
 		private bool isOut;
 		private string name;
 		private Type type;
-		private string typeName;
+//		private string typeName;
 	}
 }